summaryrefslogtreecommitdiff
path: root/package/kodi/patches
diff options
context:
space:
mode:
Diffstat (limited to 'package/kodi/patches')
-rw-r--r--package/kodi/patches/patch-CMakeLists_txt27
-rw-r--r--package/kodi/patches/patch-tools_depends_native_TexturePacker_src_decoder_GifHelper_cpp4
-rw-r--r--package/kodi/patches/patch-xbmc_dbwrappers_dataset_h10
-rw-r--r--package/kodi/patches/patch-xbmc_platform_linux_CPUInfoLinux_cpp31
4 files changed, 12 insertions, 60 deletions
diff --git a/package/kodi/patches/patch-CMakeLists_txt b/package/kodi/patches/patch-CMakeLists_txt
deleted file mode 100644
index 7fa65595b..000000000
--- a/package/kodi/patches/patch-CMakeLists_txt
+++ /dev/null
@@ -1,27 +0,0 @@
---- xbmc-21.0b2-Omega.orig/CMakeLists.txt 2023-12-09 22:24:46.000000000 +0100
-+++ xbmc-21.0b2-Omega/CMakeLists.txt 2024-01-31 10:45:45.831435209 +0100
-@@ -178,7 +178,6 @@ endforeach()
- # Required tools. Keep in alphabetical order please
- set(required_buildtools FlatC
- JsonSchemaBuilder
-- TexturePacker
- )
-
- # Optional build tools
-@@ -468,7 +467,6 @@ endif()
- add_custom_command(
- OUTPUT ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/${CONFIG_VAR}/gen_skin.timestamp
- COMMAND ${CMAKE_COMMAND} -DBUNDLEDIR=${_bundle_dir}
-- -DTEXTUREPACKER_EXECUTABLE=$<TARGET_FILE:TexturePacker::TexturePacker::Executable>
- -P ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/GeneratedPackSkins.cmake
- COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/${CONFIG_VAR}
- COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/${CONFIG_VAR}/gen_skin.timestamp
-@@ -481,7 +479,7 @@ add_custom_target(gen_skin_pack DEPENDS
-
- # Packaging target. This generates system addon, xbt creation, copy files to build tree
- add_custom_target(generate-packaging ALL
-- DEPENDS TexturePacker::TexturePacker::Executable export-files gen_skin_pack gen_system_addons)
-+ DEPENDS export-files gen_skin_pack gen_system_addons)
- # Make sure we build any libs before we look to export-files.
- # We may need to export some shared libs/data (eg Python)
- add_dependencies(export-files ${GLOBAL_TARGET_DEPS})
diff --git a/package/kodi/patches/patch-tools_depends_native_TexturePacker_src_decoder_GifHelper_cpp b/package/kodi/patches/patch-tools_depends_native_TexturePacker_src_decoder_GifHelper_cpp
index 67e51c6e9..193f5987b 100644
--- a/package/kodi/patches/patch-tools_depends_native_TexturePacker_src_decoder_GifHelper_cpp
+++ b/package/kodi/patches/patch-tools_depends_native_TexturePacker_src_decoder_GifHelper_cpp
@@ -1,5 +1,5 @@
---- xbmc-19.3-Matrix.orig/tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp 2021-10-24 12:09:58.000000000 +0200
-+++ xbmc-19.3-Matrix/tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp 2022-02-26 00:09:15.499548854 +0100
+--- xbmc-22.0a1-Piers.orig/tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp 2025-08-18 23:49:12.000000000 +0200
++++ xbmc-22.0a1-Piers/tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp 2025-10-06 14:07:24.604055678 +0200
@@ -18,11 +18,11 @@
*
*/
diff --git a/package/kodi/patches/patch-xbmc_dbwrappers_dataset_h b/package/kodi/patches/patch-xbmc_dbwrappers_dataset_h
new file mode 100644
index 000000000..f27f92975
--- /dev/null
+++ b/package/kodi/patches/patch-xbmc_dbwrappers_dataset_h
@@ -0,0 +1,10 @@
+--- xbmc-22.0a1-Piers.orig/xbmc/dbwrappers/dataset.h 2025-08-18 23:49:12.000000000 +0200
++++ xbmc-22.0a1-Piers/xbmc/dbwrappers/dataset.h 2025-10-07 06:25:46.959580300 +0200
+@@ -14,6 +14,7 @@
+
+ #include "qry_dat.h"
+
++#include <cstdarg>
+ #include <list>
+ #include <map>
+ #include <memory>
diff --git a/package/kodi/patches/patch-xbmc_platform_linux_CPUInfoLinux_cpp b/package/kodi/patches/patch-xbmc_platform_linux_CPUInfoLinux_cpp
deleted file mode 100644
index 27c420df8..000000000
--- a/package/kodi/patches/patch-xbmc_platform_linux_CPUInfoLinux_cpp
+++ /dev/null
@@ -1,31 +0,0 @@
---- xbmc-21.0b2-Omega.orig/xbmc/platform/linux/CPUInfoLinux.cpp 2023-12-09 22:24:46.000000000 +0100
-+++ xbmc-21.0b2-Omega/xbmc/platform/linux/CPUInfoLinux.cpp 2024-01-30 15:52:43.704683194 +0100
-@@ -19,10 +19,7 @@
- #include <sstream>
- #include <vector>
-
--#if (defined(__arm__) && defined(HAS_NEON)) || defined(__aarch64__)
--#include <asm/hwcap.h>
--#include <sys/auxv.h>
--#elif defined(__i386__) || defined(__x86_64__)
-+#if defined(__i386__) || defined(__x86_64__)
- #include <cpuid.h>
- #endif
-
-@@ -279,16 +276,6 @@ CCPUInfoLinux::CCPUInfoLinux()
-
- m_cpuModel = m_cpuModel.substr(0, m_cpuModel.find(char(0))); // remove extra null terminations
-
--#if defined(HAS_NEON) && defined(__arm__)
-- if (getauxval(AT_HWCAP) & HWCAP_NEON)
-- m_cpuFeatures |= CPU_FEATURE_NEON;
--#endif
--
--#if defined(HAS_NEON) && defined(__aarch64__)
-- if (getauxval(AT_HWCAP) & HWCAP_ASIMD)
-- m_cpuFeatures |= CPU_FEATURE_NEON;
--#endif
--
- // Set MMX2 when SSE is present as SSE is a superset of MMX2 and Intel doesn't set the MMX2 cap
- if (m_cpuFeatures & CPU_FEATURE_SSE)
- m_cpuFeatures |= CPU_FEATURE_MMX2;