alarm/kodi-rpi to 20.0-1

Update to Nexus release, advertise official version number, add clang support

alarm/kodi-rpi/PKGBUILD

@@ -13,14 +13,17 @@ pkgname=(
   'kodi-rpi-eventclients' 'kodi-rpi-tools-texturepacker' 'kodi-rpi-dev'
 )
 
-_commit=e64b36ecb5b16bd6915e9cbc2180a5427359e0b7
-_commitnumber=57809
+_commitnumber=61857
+_commit=4e44330cfd803931be290635bc2144c727ef7b36
 
-pkgver=19.5."$_commitnumber"
-_sourcev="$pkgver.${_commit:0:10}"
+# set this to anything to build with clang
+# recommend manually setting -DUSE_LTO=OFF to -DUSE_LTO=$(nproc) in build()
+_clangbuild=
+
+pkgver=20.0
 pkgrel=1
-arch=('armv7h' 'aarch64')
-url="https://github.com/graysky2/xbmc/tree/gs-gbm_matrix"
+arch=('aarch64' 'armv7h')
+url="https://github.com/graysky2/xbmc/tree/gs-gbm_nexus"
 license=('GPL2')
 makedepends=(
   'afpfs-ng' 'bluez-libs' 'cmake' 'curl' 'dav1d' 'doxygen' 'git' 'glew'
@@ -33,26 +36,26 @@ makedepends=(
   'upower' 'giflib' 'rapidjson' 'ghostscript' 'meson' 'gtest' 'graphviz'
   'libinput' 'libxkbcommon' 'pcre'
 )
-_codename=Matrix
+[[ -n "$_clangbuild" ]] && makedepends+=('clang' 'lld' 'llvm')
+
+_codename=Nexus
 _init_version=1.136
-_libdvdcss_version="1.4.2-Leia-Beta-5"
-_libdvdnav_version="6.0.0-Leia-Alpha-3"
-_libdvdread_version="6.0.0-Leia-Alpha-3"
-#_ffmpeg_version="4.3.2-$_codename-19.2"
-_ffmpeg_version="4.3-kodi-dav1d-1.0"
-_fmt_version="6.1.2"
-_spdlog_version="1.5.0"
-_crossguid_version="8f399e8bd4"
+_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="1.12.0"
-_libudfread_version="1.1.0"
+_flatbuffers_version="2.0.0"
+_libudfread_version="1.1.2"
 source=(
-  "xbmc-$_sourcev.tar.gz::https://github.com/graysky2/xbmc/archive/$_commit.tar.gz"
+  "xbmc-$pkgver.${_commit:0:10}.tar.gz::https://github.com/graysky2/xbmc/archive/$_commit.tar.gz"
   "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"
   "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://sources.archlinux.org/other/community/kodi/kodi-ffmpeg-$_ffmpeg_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"
@@ -61,7 +64,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
-  0001-upstream-build-fixes-from-debian.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/22291.patch
 )
 backup=(boot/kodi.config.txt etc/conf.d/kodi-standalone)
 noextract=(
@@ -76,27 +78,24 @@ noextract=(
   "flatbuffers-$_flatbuffers_version.tar.gz"
   "libudfread-$_libudfread_version.tar.gz"
 )
-sha256sums=('aab7537899b61a006ce19fd9f060013920153a34752cca1109f3aeb1a707e9be'
-            '38816f8373e243bc5950449b4f3b18938c4e1c59348e3411e23f31db4072e40d'
-            '071e414e61b795f2ff9015b21a85fc009dde967f27780d23092643916538a57a'
-            'a30b6aa0aad0f2c505bc77948af2d5531a80b6e68112addb4c123fca24d5d3bf'
-            '9d8b26e2a16029c4c15fd3232303515a3cb37b1d2bff02ee0fa5f0230c3a2fd4'
-            '1cafc80701b746085dddf41bd9193e6d35089e1c6ec1940e037fcb9c98f62365'
-            'b38e0bbef7faac2b82fed550a0c19b0d4e7f6737d5321d4fd8f216b80f8aee8a'
-            '3d77d09a5df0de510aeeb940df4cb534787ddff3bb1828779753f5dfa1229d10'
+sha256sums=('6cdcbcfb1bcd9e55bf613ba7ba9e3f6ff4f1335a361901a9c27f3f95cb436f51'
+            'f38c4a4e7a4f4da6d8e83b8852489aa3bb6588a915dc41f5ee89d9aad305a06e'
+            '584f62a3896794408d46368e2ecf2c6217ab9c676ce85921b2d68b8961f49dfc'
+            '719130091e3adc9725ba72df808f24a14737a009dca5a4c38c601c0c76449b62'
+            'abbce62231baffe237e412689c71ffe01bfc83135afd375f1e538caae87729ed'
+            '5dea48d1fcddc3ec571ce2058e13910a0d4a6bab4cc09a809d8b1dd1c88ae6f2'
+            '697f91700237dbae2326b90469be32b876b2b44888302afbc7aceb68bcfe8224'
+            '6be27e0b3a4907f0cd3cfadec255ee1b925569e1bd06e67a4d2f4267299b69c4'
             'e4018e850f80700acee8da296e56e15b1eef711ab15157e542e7d7e1237c3476'
-            '62f2223fb9181d1d6338451375628975775f7522185266cd5296571ac152bc45'
-            '5ad9f95c53e8f29853c1fefa0a20a301be4045e2c7ae49d1164bc74d94155627'
+            '9ddb9031798f4f8754d00fca2f1a68ecf9d0f83dfac7239af1311e4fd9a565c4'
+            '2bf16726ac98d093156195bb049a663e07d3323e079c26912546f4e05c77bac5'
             'b94c70baa45e30346224ceecfab031dd183e09303b1f97d6522f9941da9b0067'
-            '9ce6051a2157e6b677090f201d98870a33db6c90c91dc0d480a87fb7ab84e3e5'
-            'cac4d2a509dbc9b126428ea9338c3ef3b820637a0332c2de4f1c4ec983def1dc')
+            '9ce6051a2157e6b677090f201d98870a33db6c90c91dc0d480a87fb7ab84e3e5')
 
 prepare() {
   [[ -d kodi-build ]] && rm -rf kodi-build
   mkdir "$srcdir/kodi-build"
   cd "xbmc-$_commit"
-
-  patch -p1 -i ../0001-upstream-build-fixes-from-debian.patch
 }
 
 build() {
@@ -120,6 +119,14 @@ build() {
   CFLAGS+=" -O2 -pipe -fstack-protector-strong -fno-plt -fexceptions -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -fstack-clash-protection"
   CXXFLAGS+="${CFLAGS} -Wp,-D_GLIBCXX_ASSERTIONS"
 
+  if [[ -n "$_clangbuild" ]]; then
+    export CC=clang CXX=clang++
+    # depending on your build system, optionally redefine DISTCC_HOSTS
+    # since current toolchain does not include clang support x86_64 volunteers
+    #unset DISTCC_HOSTS
+    #export DISTCC_HOSTS="localhost/5 10.0.1.103/5:3636"
+  fi
+
   _args=(
     -DCMAKE_BUILD_TYPE=Release
     -DCMAKE_INSTALL_PREFIX=/usr
@@ -140,7 +147,7 @@ build() {
     -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/kodi-ffmpeg-$_ffmpeg_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"
@@ -160,7 +167,7 @@ build() {
 }
 
 package_kodi-rpi() {
-  pkgdesc="Media player and entertainment hub with hw accel for RPi 3/4/400, gbm_matrix fork"
+  pkgdesc="Media player and entertainment hub with hw accel for RPi 3/4/400, gbm_nexus fork"
   depends=(
     'bluez-libs' 'curl' 'dav1d' 'desktop-file-utils' 'hicolor-icon-theme'
     'lcms2' 'libass' 'libbluray' 'libcdio' 'libcec-rpi' 'libmicrohttpd' 'libnfs'
@@ -169,6 +176,8 @@ package_kodi-rpi() {
     'shairplay' 'smbclient' 'sqlite' 'taglib' 'tinyxml'
     'libinput' 'libxkbcommon' 'polkit' 'linux>=5.4.35' 'lzo' 'pcre'
   )
+  [[ -n "$_clangbuild" ]] && depends+=('glu')
+
   optdepends=(
     'afpfs-ng: Apple shares support'
     'bluez: Blutooth support'
@@ -196,7 +205,7 @@ package_kodi-rpi() {
   # setup video drivers for kodi-gbm
   install -Dm0644 "$srcdir/kodi.config.txt" "$pkgdir/boot/kodi.config.txt"
 
-  # rpi4 wants 512 MB of memory
+  # rpi4 wants 512 MB of memory ... might be a problem or rpi3?
   sed -i 's/@@@/512/' "$pkgdir/boot/kodi.config.txt"
 
   _initshit="$srcdir/kodi-standalone-service-$_init_version/arm"