[Solution Proposal] kodi-inputstream-adaptive-19.0.0 fails

[gr3m1in]

Hi everyone,

The topic is related to this bug
https://bugs.gentoo.org/899754

I've faced the same problem and would like to propose a workaround.
The patches are to be placed at

Code: Select all

/etc/portage/patches/media-plugins/kodi-inputstream-adaptive-19.0.0

with any filenames of choice with ".patch" extension, eg.

Iaes_decrypter-stdint.patch

Code: Select all

--- inputstream.adaptive-19.0.0-Matrix/src/Iaes_decrypter.h     2021-09-14 14:28:17.000000000 -0000
+++ inputstream.adaptive-19.0.0-Matrix/src/Iaes_decrypter.h     2023-06-28 11:40:25.838180679 -0000
@@ -3,6 +3,7 @@
 #include "Ap4Types.h"
 
 #include <string>
+#include "stdint.h"
 
 class IAESDecrypter
 {
@@ -21,4 +22,4 @@
 
 private:
   std::string m_licenseKey;
-};
\ No newline at end of file
+};

and
helpers-main.patch

Code: Select all

--- inputstream.adaptive-19.0.0-Matrix/src/helpers.cpp  2023-06-28 11:13:31.076158345 -0000
+++ inputstream.adaptive-19.0.0-Matrix/src/helpers.cpp  2023-06-28 11:14:42.808100770 -0000
@@ -21,6 +21,7 @@
 #include "oscompat.h"
 #include <stdlib.h>
 #include <sstream>
+#include "main.h"
 
 #ifndef BYTE
 typedef unsigned char BYTE;

with these simple patches the package builds successfully

Code: Select all

[I] media-plugins/kodi-inputstream-adaptive
     Available versions:  (~)19.0.0^t **9999*l^t {test}
     Installed versions:  19.0.0^t(11:42:40 06/28/23)(-test)
     Homepage:            https://github.com/peak3d/inputstream.adaptive.git
     Description:         Kodi's Adaptive inputstream addon

Hope it will be helpful.
And anyone with gentoo bugzilla's account please feel free to post the patches there.

Regards
gr3m1in

[gr3m1in]

For some reason, the diffutils (likely, since sys-devel/patch-2.7.6-r5 is the same on both hosts) version mixes in, so the patches above do apply correctly on

Code: Select all

sys-apps/diffutils-3.10

but they fail on

Code: Select all

sys-apps/diffutils-3.9-r1

with

Code: Select all

can't find file to patch

and for latter versions (below sys-apps/diffutils-3.10) the paths at the two upper lines should be preceded with "a/" and "b/" respectively:

Code: Select all

--- a/inputstream.adaptive-19.0.0-Matrix/src/helpers.cpp  2023-06-28 11:13:31.076158345 -0000
+++ b/inputstream.adaptive-19.0.0-Matrix/src/helpers.cpp  2023-06-28 11:14:42.808100770 -0000 

...

and

Code: Select all

--- a/inputstream.adaptive-19.0.0-Matrix/src/Iaes_decrypter.h     2021-09-14 14:28:17.000000000 -0000
+++ b/inputstream.adaptive-19.0.0-Matrix/src/Iaes_decrypter.h     2023-06-28 11:40:25.838180679 -0000 

...