From 3edd0f0fed7babf4ca1c2ea48c306126580fb760 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sat, 14 Oct 2023 02:23:58 +0000 Subject: [PATCH] kodi: update patch for Odroid XU3/XU4 ref: - https://github.com/xbmc/xbmc/commit/8ba612c86bdf090e8b7a960daf02a4908e12b078 --- ...002-LOCAL-changes-for-Odroid-XU3-XU4.patch | 46 ++++++++++--------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/projects/Samsung/patches/kodi/kodi-0002-LOCAL-changes-for-Odroid-XU3-XU4.patch b/projects/Samsung/patches/kodi/kodi-0002-LOCAL-changes-for-Odroid-XU3-XU4.patch index 4b51665953..dbc7e381df 100644 --- a/projects/Samsung/patches/kodi/kodi-0002-LOCAL-changes-for-Odroid-XU3-XU4.patch +++ b/projects/Samsung/patches/kodi/kodi-0002-LOCAL-changes-for-Odroid-XU3-XU4.patch @@ -4,7 +4,7 @@ Date: Fri, 24 Jun 2022 18:04:13 +0000 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 +- .../DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp | 66 +++++++++++++++++-- .../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/WinSystemGbmEGLContext.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 index 37a26a7bc4..53cc04663e 100644 --- a/cmake/modules/FindGBM.cmake +++ b/cmake/modules/FindGBM.cmake -@@ -51,12 +51,12 @@ if(GBM_FOUND) - set(GBM_LIBRARIES ${GBM_LIBRARY}) - set(GBM_INCLUDE_DIRS ${GBM_INCLUDE_DIR}) - set(GBM_DEFINITIONS -DHAVE_GBM=1) -- if(GBM_HAS_BO_MAP) -- list(APPEND GBM_DEFINITIONS -DHAS_GBM_BO_MAP=1) -- endif() -- if(GBM_HAS_MODIFIERS) -- list(APPEND GBM_DEFINITIONS -DHAS_GBM_MODIFIERS=1) -- endif() -+ #if(GBM_HAS_BO_MAP) -+ # list(APPEND GBM_DEFINITIONS -DHAS_GBM_BO_MAP=1) -+ #endif() -+ #if(GBM_HAS_MODIFIERS) -+ # list(APPEND GBM_DEFINITIONS -DHAS_GBM_MODIFIERS=1) -+ #endif() - if(NOT TARGET GBM::GBM) - add_library(GBM::GBM UNKNOWN IMPORTED) - set_target_properties(GBM::GBM PROPERTIES +@@ -50,14 +50,14 @@ + IMPORTED_LOCATION "${GBM_LIBRARY}" + INTERFACE_INCLUDE_DIRECTORIES "${GBM_INCLUDE_DIR}" + INTERFACE_COMPILE_DEFINITIONS "HAVE_GBM=1") +- if(GBM_HAS_BO_MAP) +- set_property(TARGET GBM::GBM APPEND PROPERTY +- INTERFACE_COMPILE_DEFINITIONS HAS_GBM_BO_MAP=1) +- endif() +- if(GBM_HAS_MODIFIERS) +- set_property(TARGET GBM::GBM APPEND PROPERTY +- INTERFACE_COMPILE_DEFINITIONS HAS_GBM_MODIFIERS=1) +- endif() ++ #if(GBM_HAS_BO_MAP) ++ # set_property(TARGET GBM::GBM APPEND PROPERTY ++ # INTERFACE_COMPILE_DEFINITIONS HAS_GBM_BO_MAP=1) ++ #endif() ++ #if(GBM_HAS_MODIFIERS) ++ # set_property(TARGET GBM::GBM APPEND PROPERTY ++ # 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 index 531974f3f4..6244ef7515 100644 --- a/system/settings/linux.xml