diff --git a/kodi-inputstream-adaptive-20.3.12-gcc-13.2.patch b/kodi-inputstream-adaptive-20.3.12-gcc-13.2.patch new file mode 100644 index 0000000..a7691e2 --- /dev/null +++ b/kodi-inputstream-adaptive-20.3.12-gcc-13.2.patch @@ -0,0 +1,126 @@ +From e5928d5dbb49a3dcb17ff9814ac4fceceb0032c2 Mon Sep 17 00:00:00 2001 +From: BlackEagle +Date: Sat, 3 Jun 2023 12:42:09 +0200 +Subject: [PATCH] =?UTF-8?q?Fix=20error:=20=E2=80=98uint*=5Ft=E2=80=99=20ha?= + =?UTF-8?q?s=20not=20been=20declared=20with=20gcc=2013?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When building with gcc 13 there are various build issues like: + +``` +[ 48%] Building CXX object CMakeFiles/inputstream.adaptive.dir/src/aes_decrypter.cpp.o +In file included from /home/ike/devel/github/inputstream.adaptive-upstream/src/aes_decrypter.h:11, + from /home/ike/devel/github/inputstream.adaptive-upstream/src/aes_decrypter.cpp:9: +/home/ike/devel/github/inputstream.adaptive-upstream/src/Iaes_decrypter.h:28:31: error: ‘uint8_t’ has not been declared + 28 | virtual void ivFromSequence(uint8_t* buffer, uint64_t sid) = 0; + | ^~~~~~~ +/home/ike/devel/github/inputstream.adaptive-upstream/src/Iaes_decrypter.h:28:48: error: ‘uint64_t’ has not been declared + 28 | virtual void ivFromSequence(uint8_t* buffer, uint64_t sid) = 0; + | ^~~~~~~~ +make[2]: *** [CMakeFiles/inputstream.adaptive.dir/build.make:692: CMakeFiles/inputstream.adaptive.dir/src/aes_decrypter.cpp.o] Error 1 +make[1]: *** [CMakeFiles/Makefile2:210: CMakeFiles/inputstream.adaptive.dir/all] Error 2 +make: *** [Makefile:166: all] Error 2 +``` + +Using the `#include ` in the various headers fixes this issue. + +Signed-off-by: BlackEagle +--- + src/Iaes_decrypter.h | 1 + + src/SSD_dll.h | 1 + + src/test/KodiStubs.h | 1 + + src/utils/FileUtils.h | 1 + + src/utils/PropertiesUtils.h | 1 + + src/utils/StringUtils.h | 1 + + src/utils/Utils.h | 1 + + 7 files changed, 7 insertions(+) + +diff --git a/src/Iaes_decrypter.h b/src/Iaes_decrypter.h +index 7fdf604..e7f889b 100644 +--- a/src/Iaes_decrypter.h ++++ b/src/Iaes_decrypter.h +@@ -11,6 +11,7 @@ + #include + + #include ++#include + + class IAESDecrypter + { +diff --git a/src/SSD_dll.h b/src/SSD_dll.h +index 6298d09..bf75346 100644 +--- a/src/SSD_dll.h ++++ b/src/SSD_dll.h +@@ -10,6 +10,7 @@ + + #include // va_list, va_start, va_arg, va_end + #include ++#include + + //Functionality wich is supported by the Decrypter + class Adaptive_CencSingleSampleDecrypter; +diff --git a/src/test/KodiStubs.h b/src/test/KodiStubs.h +index 7a9d8e6..fe5107b 100644 +--- a/src/test/KodiStubs.h ++++ b/src/test/KodiStubs.h +@@ -12,6 +12,7 @@ + + #include + #include ++#include + + #ifdef _WIN32 // windows + #if !defined(_SSIZE_T_DEFINED) && !defined(HAVE_SSIZE_T) +diff --git a/src/utils/FileUtils.h b/src/utils/FileUtils.h +index 40745b0..92e75b1 100644 +--- a/src/utils/FileUtils.h ++++ b/src/utils/FileUtils.h +@@ -10,6 +10,7 @@ + + #include + #include ++#include + + namespace UTILS + { +diff --git a/src/utils/PropertiesUtils.h b/src/utils/PropertiesUtils.h +index b277f58..0f0ba49 100644 +--- a/src/utils/PropertiesUtils.h ++++ b/src/utils/PropertiesUtils.h +@@ -11,6 +11,7 @@ + #include + #include + #include ++#include + + namespace UTILS + { +diff --git a/src/utils/StringUtils.h b/src/utils/StringUtils.h +index fbafccd..066a6de 100644 +--- a/src/utils/StringUtils.h ++++ b/src/utils/StringUtils.h +@@ -11,6 +11,7 @@ + #include + #include + #include ++#include + + namespace UTILS + { +diff --git a/src/utils/Utils.h b/src/utils/Utils.h +index e7ae209..24bccaf 100644 +--- a/src/utils/Utils.h ++++ b/src/utils/Utils.h +@@ -12,6 +12,7 @@ + #include + #include + #include ++#include + + namespace UTILS + { +-- +2.40.1 + diff --git a/kodi-inputstream-adaptive.spec b/kodi-inputstream-adaptive.spec index b5075d7..9076668 100644 --- a/kodi-inputstream-adaptive.spec +++ b/kodi-inputstream-adaptive.spec @@ -1,7 +1,7 @@ %define majver %(echo %version | cut -d. -f1) %define bento_version 1.6.0-639-6 Name: kodi-inputstream-adaptive -Version: 20.3.9 +Version: 20.3.12 Release: 1mamba Summary: kodi inputstream addon for several manifest types Group: Graphical Desktop/Applications/Multimedia @@ -11,6 +11,7 @@ Packager: Silvan Calarco URL: https://github.com/xbmc/inputstream.adaptive Source: https://github.com/xbmc/inputstream.adaptive.git/%{version}-Nexus/inputstream.adaptive-%{version}.tar.bz2 Source1: https://github.com/xbmc/Bento4/archive/refs/tags/%{bento_version}-Nexus.tar.gz +Patch0: kodi-inputstream-adaptive-20.3.12-gcc-13.2.patch License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -30,6 +31,8 @@ kodi inputstream addon for several manifest types. %prep %setup -q -n inputstream.adaptive-%{version} +%define _default_patch_fuzz 2 +%patch 0 -p1 -b .gcc-13.2 %build %cmake -d build \ @@ -55,6 +58,9 @@ kodi inputstream addon for several manifest types. %{_datadir}/kodi/addons/inputstream.adaptive/* %changelog +* Mon Aug 28 2023 Automatic Build System 20.3.12-1mamba +- automatic version update by autodist + * Wed May 31 2023 Automatic Build System 20.3.9-1mamba - automatic version update by autodist