alarm/kodi-rpi to 20.3-3

Nexus does not build with external taglib 2.0 so just build with internal 1.13.1.
According to LE[1], 64-bit is fine but let's keep the PKGBUILD simple for both
armv7h and aarch64.  Omega should not suffer from this problem and Nexus is nearing
EOL anyway.

1. https://github.com/LibreELEC/LibreELEC.tv/pull/8568

alarm/kodi-rpi/0002-taglib-use-1.13.1-for-internal-build-like-LE.patch

@@ -0,0 +1,25 @@
+From 674dff295d535ab063ea18a5f6d7b06e24994cf6 Mon Sep 17 00:00:00 2001
+From: graysky <therealgraysky@proton.me>
+Date: Fri, 2 Feb 2024 14:58:55 -0500
+Subject: [PATCH] taglib: use 1.13.1 for internal build like LE
+
+---
+ tools/depends/target/taglib/TAGLIB-VERSION | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tools/depends/target/taglib/TAGLIB-VERSION b/tools/depends/target/taglib/TAGLIB-VERSION
+index 8f980b0..d9d76c8 100644
+--- a/tools/depends/target/taglib/TAGLIB-VERSION
++++ b/tools/depends/target/taglib/TAGLIB-VERSION
+@@ -1,6 +1,6 @@
+ LIBNAME=taglib
+-VERSION=1.12
++VERSION=1.13.1
+ ARCHIVE=$(LIBNAME)-$(VERSION).tar.gz
+-SHA512=7e369faa5e3c6c6401052b7a19e35b0cf8c1e5ed9597053ac731a7718791d5d4803d1b18a93e903ec8c3fc6cb92e34d9616daa2ae4d326965d4c4d5624dcdaba
++SHA512=986231ee62caa975afead7e94630d58acaac25a38bc33d4493d51bd635d79336e81bba60586d7355ebc0670e31f28d32da3ecceaf33292e4bc240c64bf00f35b
+ BYPRODUCT=libtag.a
+ BYPRODUCT_WIN=tag.lib
+-- 
+2.43.0
+

alarm/kodi-rpi/PKGBUILD

@@ -21,7 +21,7 @@ _commit=8bda950342221a2b210eab73c224935270506fa9
 _clangbuild=
 
 pkgver=20.3
-pkgrel=2
+pkgrel=3
 arch=('aarch64' 'armv7h')
 url="https://github.com/graysky2/xbmc/tree/gs-gbm_nexus"
 license=('GPL2')
@@ -32,7 +32,7 @@ makedepends=(
   'libmodplug' 'libmpeg2' 'libnfs' 'libplist' 'libpulse'
   'libxrandr' 'libxslt' 'lirc' 'lzo' 'mesa' 'nasm'
   'pipewire' 'python-pycryptodomex' 'python-pillow' 'python-pybluez'
-  'python-simplejson' 'shairplay' 'smbclient' 'sndio' 'spdlog' 'taglib'
+  'python-simplejson' 'shairplay' 'smbclient' 'sndio' 'spdlog'
   'tinyxml' 'swig' 'upower' 'giflib' 'rapidjson' 'ghostscript' 'meson' 'gtest'
   'graphviz' 'libinput' 'libxkbcommon' 'pcre'
 )
@@ -65,15 +65,14 @@ source=(
   "https://mirrors.kodi.tv/build-deps/sources/fstrcmp-$_fstrcmp_version.tar.gz"
   "https://mirrors.kodi.tv/build-deps/sources/flatbuffers-$_flatbuffers_version.tar.gz"
   "https://mirrors.kodi.tv/build-deps/sources/libudfread-$_libudfread_version.tar.gz"
+  https://taglib.github.io/releases/taglib-1.13.1.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-ffmpeg-update-for-official-5.1.4.patch
   flatbuffers-23.3.3.patch::https://github.com/xbmc/xbmc/commit/35be40daa39965a9ea5b3569eb7d515e6a14da5d.patch
   pr23703.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/23703.patch
   https://github.com/xbmc/xbmc/pull/23227.patch
-  https://github.com/xbmc/xbmc/commit/d2022ce1.patch
+  0002-taglib-use-1.13.1-for-internal-build-like-LE.patch
-  https://github.com/xbmc/xbmc/commit/6f5dff4b.patch
-  https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/24577.patch
 )
 backup=(boot/kodi.config.txt etc/conf.d/kodi-standalone)
 noextract=(
@@ -85,6 +84,7 @@ noextract=(
   "fstrcmp-$_fstrcmp_version.tar.gz"
   "flatbuffers-$_flatbuffers_version.tar.gz"
   "libudfread-$_libudfread_version.tar.gz"
+  taglib-1.13.1.tar.gz
 )
 sha256sums=('d741f2dd5c8f80c9b725bb5694ffe7024e0f8000db0878164ef35392be5d13a0'
             'f38c4a4e7a4f4da6d8e83b8852489aa3bb6588a915dc41f5ee89d9aad305a06e'
@@ -95,15 +95,14 @@ sha256sums=('d741f2dd5c8f80c9b725bb5694ffe7024e0f8000db0878164ef35392be5d13a0'
             'e4018e850f80700acee8da296e56e15b1eef711ab15157e542e7d7e1237c3476'
             '8aff985da30aaab37edf8e5b02fda33ed4cbdd962699a8e2af98fdef306f4e4d'
             '2bf16726ac98d093156195bb049a663e07d3323e079c26912546f4e05c77bac5'
+            'c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b'
             '8f8ab84a0cf3bd382edb118e475b336ca2fe1e1d4da3ad8e4637f8278ed9179c'
             '9ba55fd29b3ef64de3869b092493a233eeb83a23d5ae378299ef9d335f271123'
             '9dd3923d87f645ed31d37bca6cd791798d7a486335e952dd09b8076bb4c1908b'
             'ea7a409c4e260bd8f4f949cbd02b7a6609ac0ec5a6920b405abc63ec1a3e312b'
             '41ed62f58f531ee65278eba2c05411c8948957989c6a21af4e19ca2623d5c03c'
             'c0570dfddbd42a88446695ec4af38f6cf8a5a99f95210eeefb596c155a18f9d9'
-            '4021ada2d3d1fe528601b5a25b04216d62011e2cc0fcac83038bf5a322305f0c'
+            'ee9f6dde1fb14e77807c179bb0a130dbf5d347b697e0afb643344ead202b31ef')
-            'd853db69112a52481713079dbf50de195afba2a2425c471a5b0dfccf2f2da669'
-            'f88c72100fc0b1c7360525f6c959cfa26bd7c5c512a9e3f68d6fdb0edb2d27dc')
 
 prepare() {
   [[ -d kodi-build ]] && rm -rf kodi-build
@@ -124,10 +123,8 @@ prepare() {
   # https://gitlab.archlinux.org/archlinux/packaging/packages/kodi/-/issues/3
   patch -p1 -i ../23227.patch
 
-  # Fix build with taglib 2
+  # modify to use internal taglib v1.13.1 due to build fails for armv7h with v2.0+
-  patch -p1 -i ../d2022ce1.patch
+  patch -p1 -i ../0002-taglib-use-1.13.1-for-internal-build-like-LE.patch
-  patch -p1 -i ../6f5dff4b.patch
-  patch -p1 -i ../24577.patch
 }
 
 build() {
@@ -191,6 +188,7 @@ build() {
     -DENABLE_INTERNAL_FSTRCMP=ON
     -DENABLE_INTERNAL_FLATBUFFERS=ON
     -DENABLE_INTERNAL_UDFREAD=ON
+    -DENABLE_INTERNAL_TAGLIB=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"
@@ -199,6 +197,7 @@ build() {
     -DFSTRCMP_URL="$srcdir/fstrcmp-$_fstrcmp_version.tar.gz"
     -DFLATBUFFERS_URL="$srcdir/flatbuffers-$_flatbuffers_version.tar.gz"
     -DUDFREAD_URL="$srcdir/libudfread-$_libudfread_version.tar.gz"
+    -DTAGLIB_URL="$srcdir/taglib-1.13.1.tar.gz"
     -DAPP_RENDER_SYSTEM=gles
     -DCORE_PLATFORM_NAME="x11 gbm"
   )
@@ -219,7 +218,7 @@ package_kodi-rpi() {
     'libplist' 'libpulse' 'libxslt' 'lirc' 'mariadb-libs'
     'mesa' 'libpipewire' 'python-pillow' 'python-pycryptodomex'
     'python-simplejson' 'shairplay' 'smbclient' 'sndio' 'spdlog' 'sqlite'
-    'taglib' 'tinyxml' 'libxkbcommon' 'polkit' 'linux>=5.4.35' 'lzo' 'libinput'
+    'tinyxml' 'libxkbcommon' 'polkit' 'linux>=5.4.35' 'lzo' 'libinput'
     'pcre'
   )
   [[ -n "$_clangbuild" ]] && depends+=('glu')