alarm/kodi-rpi to 20.5-1

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

@@ -1,25 +0,0 @@
-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

@@ -13,14 +13,14 @@ pkgname=(
   'kodi-rpi-eventclients' 'kodi-rpi-tools-texturepacker' 'kodi-rpi-dev'
 )
 
-_commitnumber=62390
-_commit=945878ff83c1191c67580dedaa058c1285b1bf86
+_commitnumber=62420
+_commit=8ff17bbfc65c9b3c1923e85c4b40e5033aceebcc
 
 # set this to anything to build with clang
 # recommend manually setting -DUSE_LTO=OFF to -DUSE_LTO=$(nproc) in build()
 _clangbuild=
 
-pkgver=20.4
+pkgver=20.5
 pkgrel=1
 arch=('aarch64' 'armv7h')
 url="https://github.com/graysky2/xbmc/tree/gs-gbm_nexus"
@@ -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'
+  'python-simplejson' 'shairplay' 'smbclient' 'sndio' 'spdlog' 'taglib'
   'tinyxml' 'swig' 'upower' 'giflib' 'rapidjson' 'ghostscript' 'meson' 'gtest'
   'graphviz' 'libinput' 'libxkbcommon' 'pcre'
 )
@@ -65,14 +65,12 @@ 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
-  0002-taglib-use-1.13.1-for-internal-build-like-LE.patch
 )
 backup=(boot/kodi.config.txt etc/conf.d/kodi-standalone)
 noextract=(
@@ -84,9 +82,8 @@ noextract=(
   "fstrcmp-$_fstrcmp_version.tar.gz"
   "flatbuffers-$_flatbuffers_version.tar.gz"
   "libudfread-$_libudfread_version.tar.gz"
-  taglib-1.13.1.tar.gz
 )
-sha256sums=('b9f4522cfc7dd2108dfcd5024a515058d1d5ce852e5a3cb537a1634d89a7ebee'
+sha256sums=('c57658cf04c18556fa7a60a9ec26cd8630da39438cf5f2e822395a47240162a1'
             'f38c4a4e7a4f4da6d8e83b8852489aa3bb6588a915dc41f5ee89d9aad305a06e'
             '584f62a3896794408d46368e2ecf2c6217ab9c676ce85921b2d68b8961f49dfc'
             '719130091e3adc9725ba72df808f24a14737a009dca5a4c38c601c0c76449b62'
@@ -95,14 +92,12 @@ sha256sums=('b9f4522cfc7dd2108dfcd5024a515058d1d5ce852e5a3cb537a1634d89a7ebee'
             'e4018e850f80700acee8da296e56e15b1eef711ab15157e542e7d7e1237c3476'
             '8aff985da30aaab37edf8e5b02fda33ed4cbdd962699a8e2af98fdef306f4e4d'
             '2bf16726ac98d093156195bb049a663e07d3323e079c26912546f4e05c77bac5'
-            'c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b'
             '8f8ab84a0cf3bd382edb118e475b336ca2fe1e1d4da3ad8e4637f8278ed9179c'
             '9ba55fd29b3ef64de3869b092493a233eeb83a23d5ae378299ef9d335f271123'
             '9dd3923d87f645ed31d37bca6cd791798d7a486335e952dd09b8076bb4c1908b'
             'ea7a409c4e260bd8f4f949cbd02b7a6609ac0ec5a6920b405abc63ec1a3e312b'
             '41ed62f58f531ee65278eba2c05411c8948957989c6a21af4e19ca2623d5c03c'
-            'c0570dfddbd42a88446695ec4af38f6cf8a5a99f95210eeefb596c155a18f9d9'
-            'ee9f6dde1fb14e77807c179bb0a130dbf5d347b697e0afb643344ead202b31ef')
+            'c0570dfddbd42a88446695ec4af38f6cf8a5a99f95210eeefb596c155a18f9d9')
 
 prepare() {
   [[ -d kodi-build ]] && rm -rf kodi-build
@@ -122,9 +117,6 @@ prepare() {
   # potential fix for thread priority crash
   # https://gitlab.archlinux.org/archlinux/packaging/packages/kodi/-/issues/3
   patch -p1 -i ../23227.patch
-
-  # modify to use internal taglib v1.13.1 due to build fails for armv7h with v2.0+
-  patch -p1 -i ../0002-taglib-use-1.13.1-for-internal-build-like-LE.patch
 }
 
 build() {
@@ -197,7 +189,6 @@ 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"
   )
@@ -218,7 +209,7 @@ package_kodi-rpi() {
     'libplist' 'libpulse' 'libxslt' 'lirc' 'mariadb-libs'
     'mesa' 'libpipewire' 'python-pillow' 'python-pycryptodomex'
     'python-simplejson' 'shairplay' 'smbclient' 'sndio' 'spdlog' 'sqlite'
-    'tinyxml' 'libxkbcommon' 'polkit' 'linux>=5.4.35' 'lzo' 'libinput'
+    'taglib' 'tinyxml' 'libxkbcommon' 'polkit' 'linux>=5.4.35' 'lzo' 'libinput'
     'pcre'
   )
   [[ -n "$_clangbuild" ]] && depends+=('glu')