diff options
Diffstat (limited to 'package/kodi/patches')
6 files changed, 73 insertions, 70 deletions
diff --git a/package/kodi/patches/patch-CMakeLists_txt b/package/kodi/patches/patch-CMakeLists_txt new file mode 100644 index 000000000..7fa65595b --- /dev/null +++ b/package/kodi/patches/patch-CMakeLists_txt @@ -0,0 +1,27 @@ +--- 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-cmake_KodiConfig_cmake_in b/package/kodi/patches/patch-cmake_KodiConfig_cmake_in deleted file mode 100644 index 3ebae759b..000000000 --- a/package/kodi/patches/patch-cmake_KodiConfig_cmake_in +++ /dev/null @@ -1,20 +0,0 @@ ---- xbmc-18.0a1-Leia.orig/cmake/KodiConfig.cmake.in 2018-03-04 10:21:28.000000000 +0100 -+++ xbmc-18.0a1-Leia/cmake/KodiConfig.cmake.in 2018-05-23 08:10:01.842094111 +0200 -@@ -8,7 +8,7 @@ if(NOT @APP_NAME_UC@_PREFIX) - set(@APP_NAME_UC@_PREFIX @APP_PREFIX@) - endif() - if(NOT @APP_NAME_UC@_INCLUDE_DIR) -- set(@APP_NAME_UC@_INCLUDE_DIR @APP_INCLUDE_DIR@) -+ set(@APP_NAME_UC@_INCLUDE_DIR ${CMAKE_FIND_ROOT_PATH}/@APP_INCLUDE_DIR@) - endif() - if(NOT @APP_NAME_UC@_LIB_DIR) - set(@APP_NAME_UC@_LIB_DIR @APP_LIB_DIR@) -@@ -20,7 +20,7 @@ set(APP_RENDER_SYSTEM @APP_RENDER_SYSTEM - if(NOT WIN32) - set(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} @CXX11_SWITCH@") - endif() --list(APPEND CMAKE_MODULE_PATH @APP_LIB_DIR@ @APP_DATA_DIR@/cmake) -+list(APPEND CMAKE_MODULE_PATH ${CMAKE_FIND_ROOT_PATH}/@APP_LIB_DIR@ ${CMAKE_FIND_ROOT_PATH}/@APP_DATA_DIR@/cmake) - - string(REPLACE ";" " " ARCH_DEFINES "@ARCH_DEFINES@") - add_definitions(${ARCH_DEFINES} -DBUILD_KODI_ADDON) diff --git a/package/kodi/patches/patch-tools_depends_native_TexturePacker_CMakeLists_txt b/package/kodi/patches/patch-tools_depends_native_TexturePacker_CMakeLists_txt deleted file mode 100644 index 2b62c1465..000000000 --- a/package/kodi/patches/patch-tools_depends_native_TexturePacker_CMakeLists_txt +++ /dev/null @@ -1,20 +0,0 @@ ---- xbmc-18.0a1-Leia.orig/tools/depends/native/TexturePacker/CMakeLists.txt 2018-03-04 10:21:28.000000000 +0100 -+++ xbmc-18.0a1-Leia/tools/depends/native/TexturePacker/CMakeLists.txt 2018-05-26 06:54:36.060611270 +0200 -@@ -33,7 +33,7 @@ set(SOURCES src/md5.cpp - src/decoder/GifHelper.cpp - src/decoder/JPGDecoder.cpp - src/decoder/PNGDecoder.cpp -- ${CMAKE_SOURCE_DIR}/xbmc/guilib/XBTF.cpp) -+ ${CORE_SOURCE_DIR}/xbmc/guilib/XBTF.cpp) - - set(CMAKE_POSITITION_INDEPENDENT_CODE 1) - -@@ -42,7 +42,7 @@ target_include_directories(TexturePacker - PRIVATE ${PNG_INCLUDE_DIRS} - ${JPEG_INCLUDE_DIR} - ${GIF_INCLUDE_DIR} -- ${CMAKE_SOURCE_DIR}/xbmc -+ ${CORE_SOURCE_DIR}/xbmc - ${CMAKE_CURRENT_SOURCE_DIR}/src - ${CMAKE_CURRENT_SOURCE_DIR}/src/decoder) - target_link_libraries(TexturePacker 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 new file mode 100644 index 000000000..67e51c6e9 --- /dev/null +++ b/package/kodi/patches/patch-tools_depends_native_TexturePacker_src_decoder_GifHelper_cpp @@ -0,0 +1,15 @@ +--- 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 +@@ -18,11 +18,11 @@ + * + */ + +-#include "GifHelper.h" + + #include <algorithm> + #include <cstdlib> + #include <cstring> ++#include "GifHelper.h" + + #define UNSIGNED_LITTLE_ENDIAN(lo, hi) ((lo) | ((hi) << 8)) + #define GIF_MAX_MEMORY 82944000U // about 79 MB, which is equivalent to 10 full hd frames. diff --git a/package/kodi/patches/patch-xbmc_cores_AudioEngine_Sinks_AESinkALSA_cpp b/package/kodi/patches/patch-xbmc_cores_AudioEngine_Sinks_AESinkALSA_cpp deleted file mode 100644 index fa943b89a..000000000 --- a/package/kodi/patches/patch-xbmc_cores_AudioEngine_Sinks_AESinkALSA_cpp +++ /dev/null @@ -1,30 +0,0 @@ ---- xbmc-18.0a1-Leia.orig/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp 2018-03-04 10:21:28.000000000 +0100 -+++ xbmc-18.0a1-Leia/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp 2018-05-26 06:48:45.750618626 +0200 -@@ -1213,7 +1213,8 @@ void CAESinkALSA::EnumerateDevicesEx(AED - * found by the enumeration process. Skip them as well ("hw", "dmix", - * "plughw", "dsnoop"). */ - -- else if (baseName != "default" -+ else if (true) -+/* baseName != "default" - && baseName != "sysdefault" - && baseName != "surround40" - && baseName != "surround41" -@@ -1223,7 +1224,7 @@ void CAESinkALSA::EnumerateDevicesEx(AED - && baseName != "hw" - && baseName != "dmix" - && baseName != "plughw" -- && baseName != "dsnoop") -+ && baseName != "dsnoop")*/ - { - EnumerateDevice(list, name, desc ? desc : name, config); - } -@@ -1380,7 +1381,7 @@ void CAESinkALSA::EnumerateDevice(AEDevi - info.m_displayName.substr(info.m_displayName.size()-5) == " HDMI") - { - /* We already know this is HDMI, strip it */ -- info.m_displayName.erase(info.m_displayName.size()-5); -+ /*info.m_displayName.erase(info.m_displayName.size()-5);*/ - } - - /* "CONEXANT Analog", "USB Audio", "HDMI 0", "ALC889 Digital" ... */ diff --git a/package/kodi/patches/patch-xbmc_platform_linux_CPUInfoLinux_cpp b/package/kodi/patches/patch-xbmc_platform_linux_CPUInfoLinux_cpp new file mode 100644 index 000000000..27c420df8 --- /dev/null +++ b/package/kodi/patches/patch-xbmc_platform_linux_CPUInfoLinux_cpp @@ -0,0 +1,31 @@ +--- 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; |