mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-28 21:26:49 +00:00
Christian Hewitt
GitHub
commit
afe5f05928
@ -0,0 +1,89 @@
|
||||
From b354c009a60bcd6d7fc04014e200a1ee9c45c167 Mon Sep 17 00:00:00 2001
|
||||
From: yaswanthsastry <yaswanth.sastry@multicorewareinc.com>
|
||||
Date: Mon, 24 Feb 2025 17:07:03 +0530
|
||||
Subject: [PATCH] Fix CMake build error with latest CMake 4.0 release
|
||||
|
||||
---
|
||||
source/CMakeLists.txt | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
|
||||
index 37dbe1a87..4f5b3ed82 100755
|
||||
--- a/source/CMakeLists.txt
|
||||
+++ b/source/CMakeLists.txt
|
||||
@@ -7,13 +7,13 @@ if(NOT CMAKE_BUILD_TYPE)
|
||||
endif()
|
||||
message(STATUS "cmake version ${CMAKE_VERSION}")
|
||||
if(POLICY CMP0025)
|
||||
- cmake_policy(SET CMP0025 OLD) # report Apple's Clang as just Clang
|
||||
+ cmake_policy(SET CMP0025 NEW) # report Apple's Clang as just Clang
|
||||
endif()
|
||||
if(POLICY CMP0042)
|
||||
cmake_policy(SET CMP0042 NEW) # MACOSX_RPATH
|
||||
endif()
|
||||
if(POLICY CMP0054)
|
||||
- cmake_policy(SET CMP0054 OLD) # Only interpret if() arguments as variables or keywords when unquoted
|
||||
+ cmake_policy(SET CMP0054 NEW) # Only interpret if() arguments as variables or keywords when unquoted
|
||||
endif()
|
||||
|
||||
project (x265)
|
||||
--
|
||||
2.48.1
|
||||
|
||||
From 51ae8e922bcc4586ad4710812072289af91492a8 Mon Sep 17 00:00:00 2001
|
||||
From: yaswanthsastry <yaswanth.sastry@multicorewareinc.com>
|
||||
Date: Mon, 7 Apr 2025 11:27:36 +0530
|
||||
Subject: [PATCH] Fix for CMake Build Errors in MacOS
|
||||
|
||||
---
|
||||
source/CMakeLists.txt | 15 +++++++--------
|
||||
1 file changed, 7 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
|
||||
index 4f5b3ed82..7183fd3ce 100755
|
||||
--- a/source/CMakeLists.txt
|
||||
+++ b/source/CMakeLists.txt
|
||||
@@ -6,18 +6,14 @@ if(NOT CMAKE_BUILD_TYPE)
|
||||
FORCE)
|
||||
endif()
|
||||
message(STATUS "cmake version ${CMAKE_VERSION}")
|
||||
-if(POLICY CMP0025)
|
||||
- cmake_policy(SET CMP0025 NEW) # report Apple's Clang as just Clang
|
||||
-endif()
|
||||
+
|
||||
if(POLICY CMP0042)
|
||||
cmake_policy(SET CMP0042 NEW) # MACOSX_RPATH
|
||||
endif()
|
||||
-if(POLICY CMP0054)
|
||||
- cmake_policy(SET CMP0054 NEW) # Only interpret if() arguments as variables or keywords when unquoted
|
||||
-endif()
|
||||
+
|
||||
|
||||
project (x265)
|
||||
-cmake_minimum_required (VERSION 2.8.8) # OBJECT libraries require 2.8.8
|
||||
+cmake_minimum_required (VERSION 2.8.8...3.10) # OBJECT libraries require 2.8.8
|
||||
include(CheckIncludeFiles)
|
||||
include(CheckFunctionExists)
|
||||
include(CheckSymbolExists)
|
||||
@@ -168,7 +164,7 @@ if(APPLE)
|
||||
add_definitions(-DMACOS=1)
|
||||
endif()
|
||||
|
||||
-if(${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
|
||||
+if(${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang" OR ${CMAKE_CXX_COMPILER_ID} STREQUAL "AppleClang")
|
||||
set(CLANG 1)
|
||||
endif()
|
||||
if(${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel")
|
||||
@@ -740,6 +736,9 @@ if((MSVC_IDE OR XCODE OR GCC) AND ENABLE_ASSEMBLY)
|
||||
if(ARM OR CROSS_COMPILE_ARM)
|
||||
# compile ARM arch asm files here
|
||||
enable_language(ASM)
|
||||
+ if(APPLE)
|
||||
+ set(ARM_ARGS ${ARM_ARGS} -arch ${CMAKE_OSX_ARCHITECTURES})
|
||||
+ endif()
|
||||
foreach(ASM ${ARM_ASMS})
|
||||
set(ASM_SRC ${CMAKE_CURRENT_SOURCE_DIR}/common/arm/${ASM})
|
||||
list(APPEND ASM_SRCS ${ASM_SRC})
|
||||
--
|
||||
2.48.1
|
||||
|
||||
@ -1,27 +0,0 @@
|
||||
From 0d4d3fcf5c58dd16b3e9a7337189141b839e4ace Mon Sep 17 00:00:00 2001
|
||||
From: Rudi Heitbaum <rudi@heitbaum.com>
|
||||
Date: Sat, 15 Apr 2023 07:41:15 +1000
|
||||
Subject: [PATCH] MidiScan: include missing <cstdint>
|
||||
|
||||
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/MidiScan.h | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/MidiScan.h b/src/MidiScan.h
|
||||
index 9c19bdf..ac959e0 100644
|
||||
--- a/src/MidiScan.h
|
||||
+++ b/src/MidiScan.h
|
||||
@@ -8,6 +8,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
+#include <cstdint>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
@ -1,113 +0,0 @@
|
||||
From 6f958ddf533753ce7aec12edf3b53a8025a4aabd Mon Sep 17 00:00:00 2001
|
||||
From: Rudi Heitbaum <rudi@heitbaum.com>
|
||||
Date: Sat, 4 May 2024 10:03:44 +0000
|
||||
Subject: [PATCH] fix gcc-14 errors and warnings
|
||||
|
||||
---
|
||||
lib/lazyusf/audiolib.c | 6 +++---
|
||||
lib/lazyusf/cpu_hle.c | 2 +-
|
||||
lib/lazyusf/main.c | 16 ++++++++--------
|
||||
lib/lazyusf/memory.c | 8 ++++----
|
||||
src/USFCodec.cpp | 2 +-
|
||||
5 files changed, 17 insertions(+), 17 deletions(-)
|
||||
|
||||
diff --git a/lib/lazyusf/audiolib.c b/lib/lazyusf/audiolib.c
|
||||
index c567928..f94fef0 100644
|
||||
--- a/lib/lazyusf/audiolib.c
|
||||
+++ b/lib/lazyusf/audiolib.c
|
||||
@@ -53,9 +53,9 @@ int alUnLink(usf_state_t * state, int paddr) {
|
||||
// _asm int 3
|
||||
|
||||
if (element->next)
|
||||
- elementNext->prev = element->prev;
|
||||
- if (element->prev)
|
||||
- elementPrev->next = element->next;
|
||||
+ elementNext->prev = element->prev;
|
||||
+ if (element->prev)
|
||||
+ elementPrev->next = element->next;
|
||||
return 1;
|
||||
}
|
||||
|
||||
diff --git a/lib/lazyusf/cpu_hle.c b/lib/lazyusf/cpu_hle.c
|
||||
index 6b04ced..a6e1ca7 100644
|
||||
--- a/lib/lazyusf/cpu_hle.c
|
||||
+++ b/lib/lazyusf/cpu_hle.c
|
||||
@@ -55,7 +55,7 @@ _HLE_Entry entrys[] = {
|
||||
|
||||
//char foundlist[2048];
|
||||
|
||||
-int sort_entrys(void * a, void * b)
|
||||
+int sort_entrys(const void * a, const void * b)
|
||||
{
|
||||
_HLE_Entry * _a = (_HLE_Entry *)a;
|
||||
_HLE_Entry * _b = (_HLE_Entry *)b;
|
||||
diff --git a/lib/lazyusf/main.c b/lib/lazyusf/main.c
|
||||
index bcc55f3..554e1fc 100644
|
||||
--- a/lib/lazyusf/main.c
|
||||
+++ b/lib/lazyusf/main.c
|
||||
@@ -20,18 +20,18 @@ void StopEmulation(usf_state_t * state)
|
||||
|
||||
void DisplayError (usf_state_t * state, char * Message, ...) {
|
||||
va_list ap;
|
||||
-
|
||||
- size_t len = strlen( state->error_message );
|
||||
-
|
||||
- if ( len )
|
||||
- state->error_message[ len++ ] = '\n';
|
||||
+
|
||||
+ size_t len = strlen( state->error_message );
|
||||
+
|
||||
+ if ( len )
|
||||
+ state->error_message[ len++ ] = '\n';
|
||||
|
||||
va_start( ap, Message );
|
||||
vsprintf( state->error_message + len, Message, ap );
|
||||
va_end( ap );
|
||||
-
|
||||
- state->last_error = state->error_message;
|
||||
- StopEmulation( state );
|
||||
+
|
||||
+ state->last_error = state->error_message;
|
||||
+ StopEmulation( state );
|
||||
|
||||
//printf("Error: %s\n", Msg);
|
||||
}
|
||||
diff --git a/lib/lazyusf/memory.c b/lib/lazyusf/memory.c
|
||||
index 444e501..3bd4ab6 100644
|
||||
--- a/lib/lazyusf/memory.c
|
||||
+++ b/lib/lazyusf/memory.c
|
||||
@@ -445,8 +445,8 @@ uint32_t r4300i_SB_VAddr ( usf_state_t * state, uint32_t VAddr, uint8_t Value )
|
||||
address = state->TLB_Map[VAddr >> 12];
|
||||
|
||||
if (address == 0) { return 0; }
|
||||
- if (address + (VAddr ^ 3) - (uintptr_t)state->N64MEM < state->RdramSize)
|
||||
- *(uint8_t *)(address + (VAddr ^ 3)) = Value;
|
||||
+ if (address + (VAddr ^ 3) - (uintptr_t)state->N64MEM < state->RdramSize)
|
||||
+ *(uint8_t *)(address + (VAddr ^ 3)) = Value;
|
||||
|
||||
return 1;
|
||||
}
|
||||
@@ -489,8 +489,8 @@ uint32_t r4300i_SH_VAddr ( usf_state_t * state, uint32_t VAddr, uint16_t Value )
|
||||
address = state->TLB_Map[VAddr >> 12];
|
||||
|
||||
if (address == 0) { return 0; }
|
||||
- if (address + 1 + (VAddr ^ 2) - (uintptr_t)state->N64MEM < state->RdramSize)
|
||||
- *(uint16_t *)(address + (VAddr ^ 2)) = Value;
|
||||
+ if (address + 1 + (VAddr ^ 2) - (uintptr_t)state->N64MEM < state->RdramSize)
|
||||
+ *(uint16_t *)(address + (VAddr ^ 2)) = Value;
|
||||
return 1;
|
||||
}
|
||||
|
||||
diff --git a/src/USFCodec.cpp b/src/USFCodec.cpp
|
||||
index 703e22c..7a439d0 100644
|
||||
--- a/src/USFCodec.cpp
|
||||
+++ b/src/USFCodec.cpp
|
||||
@@ -298,7 +298,7 @@ bool CUSFCodec::CheckEndReached(uint8_t* buffer, int size)
|
||||
|
||||
if (buffer && buffer[0] == 0)
|
||||
{
|
||||
- for (unsigned int i = 0; i < size; i++)
|
||||
+ for (int i = 0; i < size; i++)
|
||||
{
|
||||
if (buffer[i] != 0)
|
||||
{
|
||||
@ -1,27 +0,0 @@
|
||||
From 47dcb3843e02abb69c52d6f0021bd2816b8317a5 Mon Sep 17 00:00:00 2001
|
||||
From: Rudi Heitbaum <rudi@heitbaum.com>
|
||||
Date: Thu, 27 Apr 2023 02:46:59 +1000
|
||||
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>
|
||||
---
|
||||
lib/TinyEXIF/TinyEXIF.h | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/lib/TinyEXIF/TinyEXIF.h b/lib/TinyEXIF/TinyEXIF.h
|
||||
index 56354aa..b03d36b 100644
|
||||
--- a/lib/TinyEXIF/TinyEXIF.h
|
||||
+++ b/lib/TinyEXIF/TinyEXIF.h
|
||||
@@ -34,6 +34,7 @@
|
||||
#ifndef __TINYEXIF_H__
|
||||
#define __TINYEXIF_H__
|
||||
|
||||
+#include <cstdint>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
@ -1,27 +0,0 @@
|
||||
From 69671899aed02e0da2730a858a6dc1c441e05932 Mon Sep 17 00:00:00 2001
|
||||
From: Rudi Heitbaum <rudi@heitbaum.com>
|
||||
Date: Thu, 27 Apr 2023 03:00:02 +1000
|
||||
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>
|
||||
---
|
||||
lib/TinyEXIF/TinyEXIF.h | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/lib/TinyEXIF/TinyEXIF.h b/lib/TinyEXIF/TinyEXIF.h
|
||||
index 56354aa..b03d36b 100644
|
||||
--- a/lib/TinyEXIF/TinyEXIF.h
|
||||
+++ b/lib/TinyEXIF/TinyEXIF.h
|
||||
@@ -34,6 +34,7 @@
|
||||
#ifndef __TINYEXIF_H__
|
||||
#define __TINYEXIF_H__
|
||||
|
||||
+#include <cstdint>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user