[PR PATCH] kodi-addon-inputstream-adaptive: update to 21.4.4.

[PR PATCH] kodi-addon-inputstream-adaptive: update to 21.4.4.

[thespookman]

[-- Attachment #1: Type: text/plain, Size: 707 bytes --]

There is a new pull request by thespookman against master on the void-packages repository

https://github.com/thespookman/void-packages update-kodi-addon-inputstream-adaptive
https://github.com/void-linux/void-packages/pull/54016

kodi-addon-inputstream-adaptive: update to 21.4.4.
#### Testing the changes
- I tested the changes in this PR: YES

#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures:
  - aarch64
  - aarch64-musl
  - armv6l
  - armv6l-musl
  - armv7l
  - armv7l-musl
  - x86_64-musl

Closes #53872


A patch file from https://github.com/void-linux/void-packages/pull/54016.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-kodi-addon-inputstream-adaptive-54016.patch --]
[-- Type: text/x-diff, Size: 3337 bytes --]

From 01763e5ae99c04a72a325b37aa7496b7a7cf312f Mon Sep 17 00:00:00 2001
From: Sam Knoop <samknoop@gmail.com>
Date: Fri, 17 Jan 2025 17:01:44 +0000
Subject: [PATCH] kodi-addon-inputstream-adaptive: update to 21.4.4.

---
 .../patches/ppc.patch                         | 23 -------------------
 .../kodi-addon-inputstream-adaptive/template  | 21 +++++++++++------
 2 files changed, 14 insertions(+), 30 deletions(-)
 delete mode 100644 srcpkgs/kodi-addon-inputstream-adaptive/patches/ppc.patch

diff --git a/srcpkgs/kodi-addon-inputstream-adaptive/patches/ppc.patch b/srcpkgs/kodi-addon-inputstream-adaptive/patches/ppc.patch
deleted file mode 100644
index 0815e18c7a4ef7..00000000000000
--- a/srcpkgs/kodi-addon-inputstream-adaptive/patches/ppc.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/wvdecrypter/cdm/build/build_config.h
-+++ b/wvdecrypter/cdm/build/build_config.h
-@@ -123,6 +123,20 @@
- #define ARCH_CPU_ARM64 1
- #define ARCH_CPU_64_BITS 1
- #define ARCH_CPU_LITTLE_ENDIAN 1
-+#elif defined(__powerpc64__)
-+#define ARCH_CPU_PPC_FAMILY 1
-+#define ARCH_CPU_PPC64 1
-+#define ARCH_CPU_64_BITS 1
-+#ifdef __LITTLE_ENDIAN__
-+#define ARCH_CPU_LITTLE_ENDIAN 1
-+#else
-+#define ARCH_CPU_BIG_ENDIAN 1
-+#endif
-+#elif defined(__powerpc__)
-+#define ARCH_CPU_PPC_FAMILY 1
-+#define ARCH_CPU_PPC 1
-+#define ARCH_CPU_32_BITS 1
-+#define ARCH_CPU_BIG_ENDIAN 1
- #elif defined(__pnacl__)
- #define ARCH_CPU_32_BITS 1
- #define ARCH_CPU_LITTLE_ENDIAN 1
diff --git a/srcpkgs/kodi-addon-inputstream-adaptive/template b/srcpkgs/kodi-addon-inputstream-adaptive/template
index 2b919ce40b4e68..663fc578ed02bc 100644
--- a/srcpkgs/kodi-addon-inputstream-adaptive/template
+++ b/srcpkgs/kodi-addon-inputstream-adaptive/template
@@ -1,17 +1,24 @@
 # Template file for 'kodi-addon-inputstream-adaptive'
 pkgname=kodi-addon-inputstream-adaptive
-version=2.6.7
-revision=2
-_kodi_release=Matrix
+version=21.4.4
+revision=1
+_kodi_release=Omega
 build_style=cmake
-makedepends="kodi-devel kodi-platform-devel p8-platform-devel tinyxml-devel
- expat-devel"
+makedepends="gtest-devel kodi-devel kodi-platform-devel pugixml-devel"
 short_desc="Kodi inputstream addon for several manifest types"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/peak3d/inputstream.adaptive"
-distfiles="https://github.com/peak3d/inputstream.adaptive/archive/${version}-${_kodi_release}.tar.gz"
-checksum=353207f5f98bf81ce8d79cec903c28da8c0227d7c7a632692c910d81e59c2dbe
+# Bento4 version defined in https://github.com/xbmc/inputstream.adaptive/blob/Piers/depends/common/bento4/bento4.txt
+_bento4_version=1.6.0-641-Omega
+_bento4_tarball=${_bento4_version}.tar.gz
+
+distfiles="https://github.com/peak3d/inputstream.adaptive/archive/${version}-${_kodi_release}.tar.gz https://github.com/xbmc/Bento4/archive/refs/tags/${_bento4_tarball}"
+checksum="0a1074fe04fb7e9500d578490b4cda12ecfcf433495e15e7bf65861527586167 f1f8cfa4f7cb651b609e587f825607cb4b06fe5b08af876fd0154a434f9a5315"
+
+# Inputstream Adaptive needs the unextracted tarball
+skip_extraction="${_bento4_tarball}"
+configure_args=" -DENABLE_INTERNAL_BENTO4=1 -DBENTO4_URL=${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_bento4_tarball} -DVERBOSE=1"
 
 if [ -n "${CROSS_BUILD}" ]; then
 	configure_args+=" -DCMAKE_MODULE_PATH=${XBPS_CROSS_BASE}/usr/share/kodi/cmake"

Re: [PR REVIEW] kodi-addon-inputstream-adaptive: update to 21.4.4.

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 260 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/54016#discussion_r1921063668

Comment:
this is only referenced in a couple places, can those places just use `${_bento4_version}.tar.gz` directly?

Re: [PR REVIEW] kodi-addon-inputstream-adaptive: update to 21.4.4.

[thespookman]

[-- Attachment #1: Type: text/plain, Size: 278 bytes --]

New review comment by thespookman on void-packages repository

https://github.com/void-linux/void-packages/pull/54016#discussion_r1921095866

Comment:
Any objection if I just remove the `_bento4_version` variable instead? I've realised I no longer reference that anywhere else 

Re: [PR REVIEW] kodi-addon-inputstream-adaptive: update to 21.4.4.

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 273 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/54016#discussion_r1921104519

Comment:
no that's still useful. we usually put those variables up near the primary `version` (so after the `_kodi_release` line)

Re: [PR REVIEW] kodi-addon-inputstream-adaptive: update to 21.4.4.

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 210 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/54016#discussion_r1921104666

Comment:
this should go up in the first block, after `build_style`

Re: [PR PATCH] [Updated] kodi-addon-inputstream-adaptive: update to 21.4.4.

[thespookman]

[-- Attachment #1: Type: text/plain, Size: 712 bytes --]

There is an updated pull request by thespookman against master on the void-packages repository

https://github.com/thespookman/void-packages update-kodi-addon-inputstream-adaptive
https://github.com/void-linux/void-packages/pull/54016

kodi-addon-inputstream-adaptive: update to 21.4.4.
#### Testing the changes
- I tested the changes in this PR: YES

#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures:
  - aarch64
  - aarch64-musl
  - armv6l
  - armv6l-musl
  - armv7l
  - armv7l-musl
  - x86_64-musl

Closes #53872


A patch file from https://github.com/void-linux/void-packages/pull/54016.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-kodi-addon-inputstream-adaptive-54016.patch --]
[-- Type: text/x-diff, Size: 3311 bytes --]

From 7b4083182c20cb3d7287aa08e94b4826a45674d2 Mon Sep 17 00:00:00 2001
From: Sam Knoop <samknoop@gmail.com>
Date: Fri, 17 Jan 2025 17:01:44 +0000
Subject: [PATCH] kodi-addon-inputstream-adaptive: update to 21.4.4.

---
 .../patches/ppc.patch                         | 23 -------------------
 .../kodi-addon-inputstream-adaptive/template  | 19 +++++++++------
 2 files changed, 12 insertions(+), 30 deletions(-)
 delete mode 100644 srcpkgs/kodi-addon-inputstream-adaptive/patches/ppc.patch

diff --git a/srcpkgs/kodi-addon-inputstream-adaptive/patches/ppc.patch b/srcpkgs/kodi-addon-inputstream-adaptive/patches/ppc.patch
deleted file mode 100644
index 0815e18c7a4ef7..00000000000000
--- a/srcpkgs/kodi-addon-inputstream-adaptive/patches/ppc.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/wvdecrypter/cdm/build/build_config.h
-+++ b/wvdecrypter/cdm/build/build_config.h
-@@ -123,6 +123,20 @@
- #define ARCH_CPU_ARM64 1
- #define ARCH_CPU_64_BITS 1
- #define ARCH_CPU_LITTLE_ENDIAN 1
-+#elif defined(__powerpc64__)
-+#define ARCH_CPU_PPC_FAMILY 1
-+#define ARCH_CPU_PPC64 1
-+#define ARCH_CPU_64_BITS 1
-+#ifdef __LITTLE_ENDIAN__
-+#define ARCH_CPU_LITTLE_ENDIAN 1
-+#else
-+#define ARCH_CPU_BIG_ENDIAN 1
-+#endif
-+#elif defined(__powerpc__)
-+#define ARCH_CPU_PPC_FAMILY 1
-+#define ARCH_CPU_PPC 1
-+#define ARCH_CPU_32_BITS 1
-+#define ARCH_CPU_BIG_ENDIAN 1
- #elif defined(__pnacl__)
- #define ARCH_CPU_32_BITS 1
- #define ARCH_CPU_LITTLE_ENDIAN 1
diff --git a/srcpkgs/kodi-addon-inputstream-adaptive/template b/srcpkgs/kodi-addon-inputstream-adaptive/template
index 2b919ce40b4e68..bf222be5fdd587 100644
--- a/srcpkgs/kodi-addon-inputstream-adaptive/template
+++ b/srcpkgs/kodi-addon-inputstream-adaptive/template
@@ -1,17 +1,22 @@
 # Template file for 'kodi-addon-inputstream-adaptive'
 pkgname=kodi-addon-inputstream-adaptive
-version=2.6.7
-revision=2
-_kodi_release=Matrix
+version=21.4.4
+revision=1
+_kodi_release=Omega
+# Bento4 version defined in https://github.com/xbmc/inputstream.adaptive/blob/Piers/depends/common/bento4/bento4.txt
+_bento4_version=1.6.0-641-Omega
 build_style=cmake
-makedepends="kodi-devel kodi-platform-devel p8-platform-devel tinyxml-devel
- expat-devel"
+configure_args=" -DENABLE_INTERNAL_BENTO4=1 -DBENTO4_URL=${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_bento4_version}.tar.gz -DVERBOSE=1"
+makedepends="gtest-devel kodi-devel kodi-platform-devel pugixml-devel"
 short_desc="Kodi inputstream addon for several manifest types"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/peak3d/inputstream.adaptive"
-distfiles="https://github.com/peak3d/inputstream.adaptive/archive/${version}-${_kodi_release}.tar.gz"
-checksum=353207f5f98bf81ce8d79cec903c28da8c0227d7c7a632692c910d81e59c2dbe
+distfiles="https://github.com/peak3d/inputstream.adaptive/archive/${version}-${_kodi_release}.tar.gz https://github.com/xbmc/Bento4/archive/refs/tags/${_bento4_version}.tar.gz"
+checksum="0a1074fe04fb7e9500d578490b4cda12ecfcf433495e15e7bf65861527586167 f1f8cfa4f7cb651b609e587f825607cb4b06fe5b08af876fd0154a434f9a5315"
+
+# Inputstream Adaptive needs the unextracted tarball
+skip_extraction="${_bento4_version}.tar.gz"
 
 if [ -n "${CROSS_BUILD}" ]; then
 	configure_args+=" -DCMAKE_MODULE_PATH=${XBPS_CROSS_BASE}/usr/share/kodi/cmake"

Re: [PR REVIEW] kodi-addon-inputstream-adaptive: update to 21.4.4.

[thespookman]

[-- Attachment #1: Type: text/plain, Size: 185 bytes --]

New review comment by thespookman on void-packages repository

https://github.com/void-linux/void-packages/pull/54016#discussion_r1921498432

Comment:
Thanks for the explanation, done.

Re: [PR REVIEW] kodi-addon-inputstream-adaptive: update to 21.4.4.

[thespookman]

[-- Attachment #1: Type: text/plain, Size: 156 bytes --]

New review comment by thespookman on void-packages repository

https://github.com/void-linux/void-packages/pull/54016#discussion_r1921498479

Comment:
Done

Re: [PR PATCH] [Merged]: kodi-addon-inputstream-adaptive: update to 21.4.4.

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 517 bytes --]

There's a merged pull request on the void-packages repository

kodi-addon-inputstream-adaptive: update to 21.4.4.
https://github.com/void-linux/void-packages/pull/54016

Description:
#### Testing the changes
- I tested the changes in this PR: YES

#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures:
  - aarch64
  - aarch64-musl
  - armv6l
  - armv6l-musl
  - armv7l
  - armv7l-musl
  - x86_64-musl

Closes #53872