jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-29 13:46:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8213 from heitbaum/xu4

Browse Source 
Fix Odroid XU3/XU4 build
This commit is contained in:
Christian Hewitt 2023-10-14 11:00:58 +04:00 committed by GitHub
commit dd9b238459
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
projects/Samsung/patches/kodi/kodi-0002-LOCAL-changes-for-Odroid-XU3-XU4.patch
View File

@ -4,7 +4,7 @@ Date: Fri, 24 Jun 2022 18:04:13 +0000
Subject: [PATCH 2/2] LOCAL: changes for Odroid XU3/XU4 Subject: [PATCH 2/2] LOCAL: changes for Odroid XU3/XU4
--- ---
cmake/modules/FindGBM.cmake | 12 ++-- cmake/modules/FindGBM.cmake | 16 ++--
system/settings/linux.xml | 2 +- system/settings/linux.xml | 2 +-
.../DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp | 66 +++++++++++++++++-- .../DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp | 66 +++++++++++++++++--
.../DVDCodecs/Video/DVDVideoCodecFFmpeg.h | 1 + .../DVDCodecs/Video/DVDVideoCodecFFmpeg.h | 1 +
@ -12,31 +12,35 @@ Subject: [PATCH 2/2] LOCAL: changes for Odroid XU3/XU4
xbmc/windowing/gbm/GBMUtils.cpp | 28 ++++---- xbmc/windowing/gbm/GBMUtils.cpp | 28 ++++----
xbmc/windowing/gbm/WinSystemGbmEGLContext.cpp | 2 +- xbmc/windowing/gbm/WinSystemGbmEGLContext.cpp | 2 +-
xbmc/windowing/gbm/drm/DRMUtils.cpp | 2 +- xbmc/windowing/gbm/drm/DRMUtils.cpp | 2 +-
8 files changed, 90 insertions(+), 25 deletions(-) 8 files changed, 94 insertions(+), 29 deletions(-)
diff --git a/cmake/modules/FindGBM.cmake b/cmake/modules/FindGBM.cmake diff --git a/cmake/modules/FindGBM.cmake b/cmake/modules/FindGBM.cmake
index 37a26a7bc4..53cc04663e 100644 index 37a26a7bc4..53cc04663e 100644
--- a/cmake/modules/FindGBM.cmake --- a/cmake/modules/FindGBM.cmake
+++ b/cmake/modules/FindGBM.cmake +++ b/cmake/modules/FindGBM.cmake
@@ -51,12 +51,12 @@ if(GBM_FOUND) @@ -50,14 +50,14 @@
set(GBM_LIBRARIES ${GBM_LIBRARY}) IMPORTED_LOCATION "${GBM_LIBRARY}"
set(GBM_INCLUDE_DIRS ${GBM_INCLUDE_DIR}) INTERFACE_INCLUDE_DIRECTORIES "${GBM_INCLUDE_DIR}"
set(GBM_DEFINITIONS -DHAVE_GBM=1) INTERFACE_COMPILE_DEFINITIONS "HAVE_GBM=1")
- if(GBM_HAS_BO_MAP) - if(GBM_HAS_BO_MAP)
- list(APPEND GBM_DEFINITIONS -DHAS_GBM_BO_MAP=1) - set_property(TARGET GBM::GBM APPEND PROPERTY
- endif() - INTERFACE_COMPILE_DEFINITIONS HAS_GBM_BO_MAP=1)
- if(GBM_HAS_MODIFIERS) - endif()
- list(APPEND GBM_DEFINITIONS -DHAS_GBM_MODIFIERS=1) - if(GBM_HAS_MODIFIERS)
- endif() - set_property(TARGET GBM::GBM APPEND PROPERTY
+ #if(GBM_HAS_BO_MAP) - INTERFACE_COMPILE_DEFINITIONS HAS_GBM_MODIFIERS=1)
+ # list(APPEND GBM_DEFINITIONS -DHAS_GBM_BO_MAP=1) - endif()
+ #endif() + #if(GBM_HAS_BO_MAP)
+ #if(GBM_HAS_MODIFIERS) + # set_property(TARGET GBM::GBM APPEND PROPERTY
+ # list(APPEND GBM_DEFINITIONS -DHAS_GBM_MODIFIERS=1) + # INTERFACE_COMPILE_DEFINITIONS HAS_GBM_BO_MAP=1)
+ #endif() + #endif()
if(NOT TARGET GBM::GBM) + #if(GBM_HAS_MODIFIERS)
add_library(GBM::GBM UNKNOWN IMPORTED) + # set_property(TARGET GBM::GBM APPEND PROPERTY
set_target_properties(GBM::GBM PROPERTIES + # INTERFACE_COMPILE_DEFINITIONS HAS_GBM_MODIFIERS=1)
+ #endif()
set_property(GLOBAL APPEND PROPERTY INTERNAL_DEPS_PROP GBM::GBM)
endif()
endif()
diff --git a/system/settings/linux.xml b/system/settings/linux.xml diff --git a/system/settings/linux.xml b/system/settings/linux.xml
index 531974f3f4..6244ef7515 100644 index 531974f3f4..6244ef7515 100644
--- a/system/settings/linux.xml --- a/system/settings/linux.xml