up to 20.3.12

diff --git a/gcc13.patch b/gcc13.patch
deleted file mode 100644 (file)
index 89210eb..0000000
--- a/gcc13.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 7b5c284e63c1d6327db7551a0646cffcbaf9410f Mon Sep 17 00:00:00 2001
-From: Rudi Heitbaum <rudi@heitbaum.com>
-Date: Wed, 26 Apr 2023 15:47:17 +0000
-Subject: [PATCH] include missing <cstdint> to support gcc-13
-
-gcc 13 moved some includes around and as a result <cstdint> is no longer transitively
-included [1]. Explicitly include it for uint{32,64}_t.
-
-[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes
-
-Signed-off-by: Rudi Heitbaum <rudi@heitbaum.com>
----
- src/Iaes_decrypter.h        | 3 ++-
- src/SSD_dll.h               | 1 +
- src/utils/FileUtils.h       | 1 +
- src/utils/PropertiesUtils.h | 1 +
- src/utils/StringUtils.h     | 1 +
- src/utils/Utils.h           | 1 +
- src/utils/XMLUtils.h        | 1 +
- 7 files changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/src/Iaes_decrypter.h b/src/Iaes_decrypter.h
-index 7fdf6046d..da992be95 100644
---- a/src/Iaes_decrypter.h
-+++ b/src/Iaes_decrypter.h
-@@ -10,6 +10,7 @@
- 
- #include <bento4/Ap4Types.h>
- 
-+#include <cstdint>
- #include <string>
- 
- class IAESDecrypter
-@@ -31,4 +32,4 @@ class IAESDecrypter
- 
- private:
-   std::string m_licenseKey;
--};
-\ No newline at end of file
-+};
-diff --git a/src/SSD_dll.h b/src/SSD_dll.h
-index 4b2b70c1a..d23fcbe45 100644
---- a/src/SSD_dll.h
-+++ b/src/SSD_dll.h
-@@ -8,6 +8,7 @@
- 
- #pragma once
- 
-+#include <cstdint>
- #include <stdarg.h> // va_list, va_start, va_arg, va_end
- #include <string_view>
- 
-diff --git a/src/utils/FileUtils.h b/src/utils/FileUtils.h
-index 40745b0d4..0924d8ff7 100644
---- a/src/utils/FileUtils.h
-+++ b/src/utils/FileUtils.h
-@@ -8,6 +8,7 @@
- 
- #pragma once
- 
-+#include <cstdint>
- #include <string>
- #include <string_view>
- 
-diff --git a/src/utils/PropertiesUtils.h b/src/utils/PropertiesUtils.h
-index dee3e0a16..a658b835c 100644
---- a/src/utils/PropertiesUtils.h
-+++ b/src/utils/PropertiesUtils.h
-@@ -8,6 +8,7 @@
- 
- #pragma once
- 
-+#include <cstdint>
- #include <map>
- #include <string>
- #include <utility>
-diff --git a/src/utils/StringUtils.h b/src/utils/StringUtils.h
-index 3f841a274..f209546fa 100644
---- a/src/utils/StringUtils.h
-+++ b/src/utils/StringUtils.h
-@@ -8,6 +8,7 @@
- 
- #pragma once
- 
-+#include <cstdint>
- #include <string>
- #include <string_view>
- #include <vector>
-diff --git a/src/utils/Utils.h b/src/utils/Utils.h
-index 4966ece63..472a328c4 100644
---- a/src/utils/Utils.h
-+++ b/src/utils/Utils.h
-@@ -8,6 +8,7 @@
- 
- #pragma once
- 
-+#include <cstdint>
- #include <map>
- #include <string>
- #include <string_view>

diff --git a/kodi-addon-inputstream-adaptive.spec b/kodi-addon-inputstream-adaptive.spec
index 3807c7573faccf7ebe15432d6f8e2b5d1030d182..1f41439dc371d1aae940a9951af5bcf27b856864 100644 (file)
--- a/kodi-addon-inputstream-adaptive.spec
+++ b/kodi-addon-inputstream-adaptive.spec
@@ -10,16 +10,15 @@
 
 Summary:       Kodi InputStream addon for several manifest types
 Name:          kodi-addon-inputstream-adaptive
-Version:       %{kodi_ver}.3.11
+Version:       %{kodi_ver}.3.12
 Release:       1
 License:       GPL v2+
 Group:         Applications/Multimedia
 Source0:       https://github.com/xbmc/inputstream.adaptive/archive/%{version}-%{codename}/%{version}-%{codename}.tar.gz
-# Source0-md5: 34fe2ec5e123b8da0c651cd8e24d6599
+# Source0-md5: 82d0f42d01a9250553d9bc7fac2b9e3f
 Source1:       https://github.com/xbmc/Bento4/archive/%{bento4_ver}/Bento4-%{bento4_ver}.tar.gz
 # Source1-md5: 5532a65b8da2e051b70de761ee84141d
 Patch0:                bento4-hash.patch
-Patch1:                gcc13.patch
 URL:           https://github.com/xbmc/inputstream.adaptive
 BuildRequires: cmake >= 3.10
 BuildRequires: expat-devel
@@ -37,7 +36,6 @@ Kodi InputStream addon for several manifest types
 %prep
 %setup -q -n %{addon}-%{version}-%{codename}
 %patch0 -p1
-%patch1 -p1
 
 install -d build/download
 cp -p %{SOURCE1} build/download/%{bento4_ver}.tar.gz