Arch Linux User Repository

I made a patch for Kodi 22 Piers

diff --git a/PKGBUILD b/PKGBUILD
index c4ce3ff..661aafd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,29 +14,28 @@
 #                                                                             #
 ###############################################################################

-API=21
+API=22

 pkgname=kodi-addon-pvr-hts-git
-pkgver=r1132.bc4a254
+pkgver=r1220.e58408a
 pkgrel=1
 pkgdesc='Tvheadend HTSP PVR client addon for Kodi'
 arch=('armv7h' 'i686' 'x86_64')
 url="https://github.com/kodi-pvr/pvr.hts"
 license=('GPL-2.0-only')
-makedepends=('cmake' 'git' 'kodi-dev')
+makedepends=('cmake' 'git' 'kodi-git-dev')
 depends=('glibc' 'gcc-libs' 'kodi' 'kodi-platform')
 provides=('kodi-addon-pvr-hts')
 conflicts=('kodi-addon-pvr-hts' 'kodi-pvr-addons')
-source=("${pkgname}::git+https://github.com/kodi-pvr/pvr.hts.git"
-        https://github.com/kodi-pvr/pvr.hts/commit/b8fb7f6cbe9e3e9ea2737dc465a70fb4bb0951eb.patch)
-sha256sums=('SKIP'
-            '8a581a1e64e563053dfa0725e470c2dc85f0300dca0f1cd4223e0779304ff7f8')
+source=("${pkgname}::git+https://github.com/kodi-pvr/pvr.hts.git")
+sha256sums=('SKIP')

 case "$API" in
   18)  source[0]="${pkgname}::git+https://github.com/kodi-pvr/pvr.hts.git#branch=Leia" ;;
   19)  source[0]="${pkgname}::git+https://github.com/kodi-pvr/pvr.hts.git#branch=Matrix" ;;
   20)  source[0]="${pkgname}::git+https://github.com/kodi-pvr/pvr.hts.git#branch=Nexus" ;;
   21)  source[0]="${pkgname}::git+https://github.com/kodi-pvr/pvr.hts.git#branch=Omega" ;;
+  22)  source[0]="${pkgname}::git+https://github.com/kodi-pvr/pvr.hts.git#branch=Piers" ;;
   99)  ;;
   *)   echo "Unknown API version. Follow instructions in PKGBUILD." && false
 esac
@@ -46,11 +45,6 @@ pkgver() {
   printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }

-prepare() {
- cd "$pkgname"
- patch -p1 < "$srcdir"/b8fb7f6cbe9e3e9ea2737dc465a70fb4bb0951eb.patch
-}
-
 build() {
   mkdir -p "$pkgname/build"
   cd "$pkgname/build"

@Bevan The API=20 version works fine, tested on RPI 4, aarch64.

I can confirm that it works fine with the Nexus Version, I have the combination running since the release day without issues.

Due to several requests, I'm adding support for API=20 here. This is untested as I can only test against Arch's official packages which are still at Kodi version 19. I won't change the default for API until the official packages are updated though.

For kodi 20 (Nexus) I adapted:

API=20 ... case "$API" in 20) source[0]="${pkgname}::git+https://github.com/kodi-pvr/pvr.hts.git#branch=Nexus" ;;

(JFYI: kodi is on 20 on ARM, not on x86_64 yet)

as kodi is version 19 API in PKGBUILD should be 19 too

I get an error when compiling master (99): [ 32%] Building CXX object CMakeFiles/pvr.hts.dir/src/HTSPDemuxer.cpp.o In file included from /home/docmax/.cache/pacaur/kodi-addon-pvr-hts-git/src/kodi-addon-pvr-hts-git/src/HTSPDemuxer.cpp:24:0: /home/docmax/.cache/pacaur/kodi-addon-pvr-hts-git/src/kodi-addon-pvr-hts-git/src/xbmc_codec_descriptor.hpp: In static member function 'static CodecDescriptor CodecDescriptor::GetCodecByName(const char*)': /home/docmax/.cache/pacaur/kodi-addon-pvr-hts-git/src/kodi-addon-pvr-hts-git/src/xbmc_codec_descriptor.hpp:50:37: error: 'class CHelper_libXBMC_pvr' has no member named 'GetCodecByName' retVal = CodecDescriptor(PVR->GetCodecByName("MP2"), strCodecName); ^~~~~~~~~~~~~~ /home/docmax/.cache/pacaur/kodi-addon-pvr-hts-git/src/kodi-addon-pvr-hts-git/src/xbmc_codec_descriptor.hpp:52:37: error: 'class CHelper_libXBMC_pvr' has no member named 'GetCodecByName' retVal = CodecDescriptor(PVR->GetCodecByName("MPEG2VIDEO"), strCodecName); ^~~~~~~~~~~~~~ /home/docmax/.cache/pacaur/kodi-addon-pvr-hts-git/src/kodi-addon-pvr-hts-git/src/xbmc_codec_descriptor.hpp:54:37: error: 'class CHelper_libXBMC_pvr' has no member named 'GetCodecByName' retVal = CodecDescriptor(PVR->GetCodecByName("TEXT"), strCodecName); ^~~~~~~~~~~~~~ /home/docmax/.cache/pacaur/kodi-addon-pvr-hts-git/src/kodi-addon-pvr-hts-git/src/xbmc_codec_descriptor.hpp:56:37: error: 'class CHelper_libXBMC_pvr' has no member named 'GetCodecByName' retVal = CodecDescriptor(PVR->GetCodecByName(strCodecName), strCodecName); ^~~~~~~~~~~~~~ make[2]: *** [CMakeFiles/pvr.hts.dir/build.make:111: CMakeFiles/pvr.hts.dir/src/HTSPDemuxer.cpp.o] Error 1 make[1]: *** [CMakeFiles/Makefile2:68: CMakeFiles/pvr.hts.dir/all] Error 2 make: *** [Makefile:152: all] Error 2 ==> ERROR: A failure occurred in build(). Aborting...

francoism90: Indeed, when building for Krypton, kodi-platform and kodi-platform-git are identical. So I could depend on kodi-platform in that case. The dependency on the -git package has the following reasons: 1. Every version of kodi should be used with a specific version of kodi-platform. There are many people using this package with newer or older versions of Kodi than what is in the Arch repository. 2. The version of kodi-platform in the Arch repository has in the past deviated from the version corresponding to the current kodi release which lead to build failures etc.