Version bump to 21.0-6

0003-taglib-use-1.13.1-for-internal-build-like-LE.patch

+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.13
++VERSION=1.13.1
+ ARCHIVE=$(LIBNAME)-$(VERSION).tar.gz
+-SHA512=b6e3253d158b41173073c0da1915f5e4a3de947db918660817cb1c755fba7e3723ea1a335fbbc30b0dcf942348a471b493fe2ce1d52d1a808578edee14e1bfc7
++SHA512=986231ee62caa975afead7e94630d58acaac25a38bc33d4493d51bd635d79336e81bba60586d7355ebc0670e31f28d32da3ecceaf33292e4bc240c64bf00f35b
+ BYPRODUCT=libtag.a
+ BYPRODUCT_WIN=tag.lib
+-- 
+2.43.0
+

PKGBUILD

@@ -16,28 +16,28 @@ pkgname=(
   'kodi-rpi-eventclients' 'kodi-rpi-tools-texturepacker' 'kodi-rpi-dev'
 )
 
-_commitnumber=65539
-_commit=7ead006b14bf638bb1928e389b5552ec32288222
+_commitnumber=65604
+_commit=97e00d4b693ae20da5c9b9c4dd91b762b8351ff1
 
 # set this to anything to build with clang
 # recommend manually setting -DUSE_LTO=OFF to -DUSE_LTO=$(nproc) in build()
 _clangbuild=
 
 pkgver=21.0
-pkgrel=3
+pkgrel=6
 arch=('aarch64' 'armv7h')
 url="https://github.com/graysky2/xbmc/tree/gs-gbm_omega"
 license=('GPL2')
 makedepends=(
   'afpfs-ng' 'bluez-libs' 'cmake' 'curl' 'dav1d' 'doxygen' 'git' 'glew'
-  'gperf' 'hicolor-icon-theme' 'jdk17-openjdk' 'fmt' 'libaacs' 'libass'
+  'gperf' 'hicolor-icon-theme' 'fmt' 'libaacs' 'libass'
   'libbluray' 'libcdio' 'libcec' 'libgl' 'mariadb-libs' 'libmicrohttpd'
   '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' 'libdisplay-info' 'tinyxml2'
+  'graphviz' 'libinput' 'libxkbcommon' 'pcre' 'libdisplay-info' 'tinyxml2' 'python-setuptools'
 )
 
 # there are incompatibilities with recent java releases
@@ -68,11 +68,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-temp-revert-fences.patch
   0002-ffmpeg-build-with-lto-when-duse-lto.patch::https://github.com/xbmc/xbmc/commit/2cc6f1728ccb67ef575fe57680dd42836e3d6a1f.patch
-  0003-revert-platformlinux-prefer-pipewire.patch::https://github.com/xbmc/xbmc/commit/aff8e6b3a0bfd8a0163a63aa003c45e1680f65c5.patch
+  0003-taglib-use-1.13.1-for-internal-build-like-LE.patch
 )
 backup=(boot/kodi.config.txt etc/conf.d/kodi-standalone)
 noextract=(
@@ -84,9 +85,9 @@ noextract=(
   "fstrcmp-$_fstrcmp_version.tar.gz"
   "flatbuffers-$_flatbuffers_version.tar.gz"
   "libudfread-$_libudfread_version.tar.gz"
+  taglib-1.13.1.tar.gz
 )
-
-sha256sums=('9917487bc8dfef0c12d7c59c736c09072284df3c7befbc8ac418488e5116add8'
+sha256sums=('3a07933a16e51251dcaefa77b5ecb1da5bcc70c800918baa980ea05a6588b36d'
             'f38c4a4e7a4f4da6d8e83b8852489aa3bb6588a915dc41f5ee89d9aad305a06e'
             '584f62a3896794408d46368e2ecf2c6217ab9c676ce85921b2d68b8961f49dfc'
             '719130091e3adc9725ba72df808f24a14737a009dca5a4c38c601c0c76449b62'
@@ -95,11 +96,12 @@ sha256sums=('9917487bc8dfef0c12d7c59c736c09072284df3c7befbc8ac418488e5116add8'
             'e4018e850f80700acee8da296e56e15b1eef711ab15157e542e7d7e1237c3476'
             '8aff985da30aaab37edf8e5b02fda33ed4cbdd962699a8e2af98fdef306f4e4d'
             '2bf16726ac98d093156195bb049a663e07d3323e079c26912546f4e05c77bac5'
+            'c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b'
             '8f8ab84a0cf3bd382edb118e475b336ca2fe1e1d4da3ad8e4637f8278ed9179c'
             '5ac76e6ff16d8f0f60a414647bddb13b46402563dd02d69a05e90c0ddbb085f0'
             'e812fc2f74d71915c3179785a8f99647612bd21ce96f866769ee1bc58682ee3b'
             '5a2f1c5fa9189d56eaf7e05024071c57e11f92b4eeb68b4bb0555c1fdd66c890'
-            'd5eeb876bd64346083f8d0652f2a64ec13b31105c6a494c957e3fa5cb52b41d9')
+            'c0efb77425f86e8a743d59529c4ab0b2d634d53413db1c6f71974c000bc31c14')
 
 prepare() {
   [[ -d kodi-build ]] && rm -rf kodi-build
@@ -114,8 +116,8 @@ prepare() {
   # honor LTO settings when building ffmpeg
   patch -p1 -i ../0002-ffmpeg-build-with-lto-when-duse-lto.patch
 
-  # https://github.com/xbmc/xbmc/issues/25006
-  patch -p1 -i ../0003-revert-platformlinux-prefer-pipewire.patch
+  # modify to use internal taglib v1.13.1 due to build fails for armv7h with v2.0+
+  patch -p1 -i ../0003-taglib-use-1.13.1-for-internal-build-like-LE.patch
 }
 
 build() {
@@ -123,7 +125,8 @@ build() {
 
   # -march= defined in /etc/makepkg.conf will override the value for -mcpu we
   # uses here so unset them and redefine below
-  unset CFLAGS CXXFLAGS LDFLAGS
+  unset CFLAGS CXXFLAGS
+  #unset CFLAGS CXXFLAGS LDFLAGS
 
   if [[ $CARCH = "armv7h" ]]; then
     # we use -mcpu=cortex-a53 rather than cortex-a72 to maximize RPi 3B and RPi 4B/400 compatibility
@@ -140,7 +143,7 @@ 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"
-  LDFLAGS+="-Wl,-O1 -Wl,--sort-common -Wl,--as-needed -Wl,-z,relro -Wl,-z,now"
+  #LDFLAGS+="-Wl,-O1 -Wl,--sort-common -Wl,--as-needed -Wl,-z,relro -Wl,-z,now"
 
   if [[ -n "$_clangbuild" ]]; then
     export CC=clang CXX=clang++
@@ -181,6 +184,8 @@ build() {
     -DENABLE_INTERNAL_FSTRCMP=ON
     -DENABLE_INTERNAL_FLATBUFFERS=ON
     -DENABLE_INTERNAL_UDFREAD=ON
+    -DENABLE_INTERNAL_TAGLIB=ON
+    -DTAGLIB_URL="$srcdir/taglib-1.13.1.tar.gz"
     -Dlibdvdcss_URL="$srcdir/libdvdcss-$_libdvdcss_version.tar.gz"
     -Dlibdvdnav_URL="$srcdir/libdvdnav-$_libdvdnav_version.tar.gz"
     -Dlibdvdread_URL="$srcdir/libdvdread-$_libdvdread_version.tar.gz"
@@ -206,7 +211,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' 'libdisplay-info' 'tinyxml2'
   )
   [[ -n "$_clangbuild" ]] && depends+=('glu')