xbmc-libfmt.patch

   1 --- xbmc-20.2-Nexus/xbmc/addons/AddonStatusHandler.h.orig       2023-06-29 08:58:06.000000000 +0200
   2 +++ xbmc-20.2-Nexus/xbmc/addons/AddonStatusHandler.h    2023-07-26 17:12:08.111357358 +0200
   3 @@ -13,6 +13,8 @@
   4  #include "threads/CriticalSection.h"
   5  #include "threads/Thread.h"
   6
   7 +inline int format_as(ADDON_STATUS status) { return static_cast<int>(status); }
   8 +
   9  namespace ADDON
  10  {
  11    /**
  12 --- xbmc-20.2-Nexus/xbmc/network/websocket/WebSocket.h.orig     2023-06-29 08:58:06.000000000 +0200
  13 +++ xbmc-20.2-Nexus/xbmc/network/websocket/WebSocket.h  2023-07-26 17:15:57.260632930 +0200
  14 @@ -25,6 +25,8 @@ enum WebSocketFrameOpcode
  15    WebSocketUnknownFrame       = 0x10
  16  };
  17
  18 +inline int format_as(WebSocketFrameOpcode op) { return static_cast<int>(op); }
  19 +
  20  enum WebSocketState
  21  {
  22    WebSocketStateNotConnected    = 0,
  23 --- xbmc-20.2-Nexus/xbmc/windowing/Resolution.h.orig    2023-06-29 08:58:06.000000000 +0200
  24 +++ xbmc-20.2-Nexus/xbmc/windowing/Resolution.h 2023-07-26 17:05:32.830659348 +0200
  25 @@ -23,6 +23,8 @@ enum RESOLUTION
  26    RES_CUSTOM         = 16 + 1,      // First additional resolution
  27  };
  28
  29 +inline int format_as(RESOLUTION res) { return static_cast<int>(res); }
  30 +
  31  struct OVERSCAN
  32  {
  33    int left;
  34 --- xbmc-20.2-Nexus/xbmc/filesystem/CurlFile.cpp.orig   2023-07-25 22:18:10.637732418 +0200
  35 +++ xbmc-20.2-Nexus/xbmc/filesystem/CurlFile.cpp        2023-07-25 22:18:14.631087917 +0200
  36 @@ -842,7 +842,7 @@ void CCurlFile::ParseAndCorrectUrl(CURL
  37        m_proxyuser = s->GetString(CSettings::SETTING_NETWORK_HTTPPROXYUSERNAME);
  38        m_proxypassword = s->GetString(CSettings::SETTING_NETWORK_HTTPPROXYPASSWORD);
  39        CLog::LogFC(LOGDEBUG, LOGCURL, "<{}> Using proxy {}, type {}", url2.GetRedacted(),
  40 -                  m_proxyhost, proxyType2CUrlProxyType[m_proxytype]);
  41 +                  m_proxyhost, static_cast<int>(proxyType2CUrlProxyType[m_proxytype]));
  42      }
  43
  44      // get username and password
  45 @@ -1373,7 +1373,7 @@ bool CCurlFile::Exists(const CURL& url)
  46    else if (result != CURLE_REMOTE_FILE_NOT_FOUND && result != CURLE_FTP_COULDNT_RETR_FILE)
  47    {
  48      CLog::Log(LOGERROR, "CCurlFile::{} - <{}> Failed: {}({})", __FUNCTION__, url.GetRedacted(),
  49 -              g_curlInterface.easy_strerror(result), result);
  50 +              g_curlInterface.easy_strerror(result), static_cast<int>(result));
  51    }
  52
  53    errno = ENOENT;
  54 @@ -1570,7 +1570,7 @@ int CCurlFile::Stat(const CURL& url, str
  55      g_curlInterface.easy_release(&m_state->m_easyHandle, NULL);
  56      errno = ENOENT;
  57      CLog::Log(LOGERROR, "CCurlFile::{} - <{}> Failed: {}({})", __FUNCTION__, url.GetRedacted(),
  58 -              g_curlInterface.easy_strerror(result), result);
  59 +              g_curlInterface.easy_strerror(result), static_cast<int>(result));
  60      return -1;
  61    }
  62
  63 @@ -1582,7 +1582,7 @@ int CCurlFile::Stat(const CURL& url, str
  64      {
  65        g_curlInterface.easy_release(&m_state->m_easyHandle, NULL);
  66        CLog::Log(LOGINFO, "CCurlFile::{} - <{}> Content length failed: {}({})", __FUNCTION__,
  67 -                url.GetRedacted(), g_curlInterface.easy_strerror(result), result);
  68 +                url.GetRedacted(), g_curlInterface.easy_strerror(result), static_cast<int>(result));
  69        errno = ENOENT;
  70        return -1;
  71      }
  72 @@ -1614,7 +1614,7 @@ int CCurlFile::Stat(const CURL& url, str
  73      if (result != CURLE_OK)
  74      {
  75        CLog::Log(LOGINFO, "CCurlFile::{} - <{}> Filetime failed: {}({})", __FUNCTION__,
  76 -                url.GetRedacted(), g_curlInterface.easy_strerror(result), result);
  77 +                url.GetRedacted(), g_curlInterface.easy_strerror(result), static_cast<int>(result));
  78      }
  79      else
  80      {
  81 @@ -1728,7 +1728,7 @@ int8_t CCurlFile::CReadState::FillBuffer
  82              {
  83                CLog::Log(LOGERROR, "CCurlFile::CReadState::{} - ({}) Failed: {}({})", __FUNCTION__,
  84                          fmt::ptr(this), g_curlInterface.easy_strerror(msg->data.result),
  85 -                        msg->data.result);
  86 +                        static_cast<int>(msg->data.result));
  87              }
  88
  89              if ( (msg->data.result == CURLE_OPERATION_TIMEDOUT ||
  90 @@ -1886,7 +1886,7 @@ int8_t CCurlFile::CReadState::FillBuffer
  91        {
  92          CLog::Log(LOGERROR,
  93                    "CCurlFile::CReadState::{} - ({}) Multi perform failed with code {}, aborting",
  94 -                  __FUNCTION__, fmt::ptr(this), result);
  95 +                  __FUNCTION__, fmt::ptr(this), static_cast<int>(result));
  96          return FILLBUFFER_FAIL;
  97        }
  98        break;
  99 @@ -1935,7 +1935,7 @@ std::string CCurlFile::GetInfoString(int
 100    {
 101      CLog::Log(LOGERROR,
 102                "CCurlFile::{} - <{}> Info string request for type {} failed with result code {}",
 103 -              __FUNCTION__, CURL::GetRedacted(m_url), infoType, result);
 104 +              __FUNCTION__, CURL::GetRedacted(m_url), infoType, static_cast<int>(result));
 105      return "";
 106    }
 107    return (info ? info : "");
 108 --- xbmc-20.2-Nexus/xbmc/games/addons/streams/GameClientStreamVideo.cpp.orig    2023-06-29 08:58:06.000000000 +0200
 109 +++ xbmc-20.2-Nexus/xbmc/games/addons/streams/GameClientStreamVideo.cpp 2023-07-26 06:19:44.817357735 +0200
 110 @@ -70,7 +70,7 @@ RETRO::VideoStreamProperties* CGameClien
 111    const AVPixelFormat pixelFormat = CGameClientTranslator::TranslatePixelFormat(properties.format);
 112    if (pixelFormat == AV_PIX_FMT_NONE)
 113    {
 114 -    CLog::Log(LOGERROR, "GAME: Unknown pixel format: {}", properties.format);
 115 +    CLog::Log(LOGERROR, "GAME: Unknown pixel format: {}", static_cast<int>(properties.format));
 116      return nullptr;
 117    }
 118
 119 --- xbmc-20.2-Nexus/xbmc/pvr/PVREdl.cpp.orig    2023-06-29 08:58:06.000000000 +0200
 120 +++ xbmc-20.2-Nexus/xbmc/pvr/PVREdl.cpp 2023-07-26 06:28:59.336460675 +0200
 121 @@ -56,7 +56,7 @@ std::vector<EDL::Edit> CPVREdl::GetEdits
 122        edit.action = EDL::Action::COMM_BREAK;
 123        break;
 124      default:
 125 -      CLog::LogF(LOGWARNING, "Ignoring entry of unknown EDL type: {}", entry.type);
 126 +      CLog::LogF(LOGWARNING, "Ignoring entry of unknown EDL type: {}", static_cast<int>(entry.type));
 127        continue;
 128      }
 129
 130 --- xbmc-20.2-Nexus/xbmc/pvr/addons/PVRClient.cpp.orig  2023-06-29 08:58:06.000000000 +0200
 131 +++ xbmc-20.2-Nexus/xbmc/pvr/addons/PVRClient.cpp       2023-07-26 06:29:39.436394682 +0200
 132 @@ -1910,7 +1910,7 @@ void CPVRClient::cb_connection_state_cha
 133
 134      CLog::LogFC(LOGDEBUG, LOGPVR,
 135                  "State for connection '{}' on client '{}' changed from '{}' to '{}'",
 136 -                strConnectionString, client->ID(), prevState, newState);
 137 +                strConnectionString, client->ID(), static_cast<int>(prevState), static_cast<int>(newState));
 138
 139      client->SetConnectionState(newState);
 140
 141 --- xbmc-20.2-Nexus/xbmc/pvr/addons/PVRClientMenuHooks.cpp.orig 2023-06-29 08:58:06.000000000 +0200
 142 +++ xbmc-20.2-Nexus/xbmc/pvr/addons/PVRClientMenuHooks.cpp      2023-07-26 06:29:47.518345556 +0200
 143 @@ -28,7 +28,7 @@ CPVRClientMenuHook::CPVRClientMenuHook(c
 144        hook.category != PVR_MENUHOOK_RECORDING &&
 145        hook.category != PVR_MENUHOOK_DELETED_RECORDING &&
 146        hook.category != PVR_MENUHOOK_SETTING)
 147 -    CLog::LogF(LOGERROR, "Unknown PVR_MENUHOOK_CAT value: {}", hook.category);
 148 +    CLog::LogF(LOGERROR, "Unknown PVR_MENUHOOK_CAT value: {}", static_cast<int>(hook.category));
 149  }
 150
 151  bool CPVRClientMenuHook::operator ==(const CPVRClientMenuHook& right) const
 152 --- xbmc-20.2-Nexus/xbmc/pvr/addons/PVRClients.cpp.orig 2023-06-29 08:58:06.000000000 +0200
 153 +++ xbmc-20.2-Nexus/xbmc/pvr/addons/PVRClients.cpp      2023-07-26 17:13:09.880344562 +0200
 154 @@ -11,6 +11,7 @@
 155  #include "ServiceBroker.h"
 156  #include "addons/AddonEvents.h"
 157  #include "addons/AddonManager.h"
 158 +#include "addons/AddonStatusHandler.h"
 159  #include "addons/addoninfo/AddonInfo.h"
 160  #include "addons/addoninfo/AddonType.h"
 161  #include "guilib/LocalizeStrings.h"
 162 --- xbmc-20.2-Nexus/xbmc/pvr/epg/Epg.cpp.orig   2023-06-29 08:58:06.000000000 +0200
 163 +++ xbmc-20.2-Nexus/xbmc/pvr/epg/Epg.cpp        2023-07-26 17:23:19.703458066 +0200
 164 @@ -235,7 +235,7 @@ bool CPVREpg::UpdateEntry(const std::sha
 165    }
 166    else
 167    {
 168 -    CLog::LogF(LOGERROR, "Unknown epg event state value: {}", newState);
 169 +    CLog::LogF(LOGERROR, "Unknown epg event state value: {}", static_cast<int>(newState));
 170      bRet = false;
 171    }
 172
 173 --- xbmc-20.2-Nexus/xbmc/FileItem.cpp.orig      2023-06-29 08:58:06.000000000 +0200
 174 +++ xbmc-20.2-Nexus/xbmc/FileItem.cpp   2023-07-26 17:31:15.723519932 +0200
 175 @@ -3090,7 +3090,7 @@ bool CFileItemList::Load(int windowID)
 176        CArchive ar(&file, CArchive::load);
 177        ar >> *this;
 178        CLog::Log(LOGDEBUG, "Loading items: {}, directory: {} sort method: {}, ascending: {}", Size(),
 179 -                CURL::GetRedacted(GetPath()), m_sortDescription.sortBy,
 180 +                CURL::GetRedacted(GetPath()), static_cast<int>(m_sortDescription.sortBy),
 181                  m_sortDescription.sortOrder == SortOrderAscending ? "true" : "false");
 182        ar.Close();
 183        file.Close();
 184 @@ -3128,7 +3128,7 @@ bool CFileItemList::Save(int windowID)
 185      CArchive ar(&file, CArchive::store);
 186      ar << *this;
 187      CLog::Log(LOGDEBUG, "  -- items: {}, sort method: {}, ascending: {}", iSize,
 188 -              m_sortDescription.sortBy,
 189 +              static_cast<int>(m_sortDescription.sortBy),
 190                m_sortDescription.sortOrder == SortOrderAscending ? "true" : "false");
 191      ar.Close();
 192      file.Close();
 193 --- xbmc-20.2-Nexus/xbmc/dbwrappers/mysqldataset.cpp.orig       2023-06-29 08:58:06.000000000 +0200
 194 +++ xbmc-20.2-Nexus/xbmc/dbwrappers/mysqldataset.cpp    2023-07-26 18:11:02.864356742 +0200
 195 @@ -1957,7 +1957,7 @@ bool MysqlDataset::query(const std::stri
 196            break;
 197          case MYSQL_TYPE_NULL:
 198          default:
 199 -          CLog::Log(LOGDEBUG, "MYSQL: Unknown field type: {}", fields[i].type);
 200 +          CLog::Log(LOGDEBUG, "MYSQL: Unknown field type: {}", static_cast<int>(fields[i].type));
 201            v.set_asString("");
 202            v.set_isNull();
 203            break;
 204 --- xbmc-20.2-Nexus/xbmc/utils/DatabaseUtils.h.orig     2023-06-29 08:58:06.000000000 +0200
 205 +++ xbmc-20.2-Nexus/xbmc/utils/DatabaseUtils.h  2023-07-26 18:55:29.344549718 +0200
 206 @@ -153,6 +153,8 @@ typedef enum
 207    FieldMax
 208  } Field;
 209
 210 +inline int format_as(Field f) { return static_cast<int>(f); }
 211 +
 212  typedef std::set<Field> Fields;
 213  typedef std::vector<Field> FieldList;
 214
 215 --- xbmc-20.2-Nexus/xbmc/guilib/guiinfo/GUIInfoColor.h.orig     2023-06-29 08:58:06.000000000 +0200
 216 +++ xbmc-20.2-Nexus/xbmc/guilib/guiinfo/GUIInfoColor.h  2023-07-26 19:29:23.583563192 +0200
 217 @@ -48,6 +48,8 @@ private:
 218    UTILS::COLOR::Color m_color;
 219  };
 220
 221 +inline UTILS::COLOR::Color format_as(const CGUIInfoColor &c) { return UTILS::COLOR::Color(c); }
 222 +
 223  } // namespace GUIINFO
 224  } // namespace GUILIB
 225  } // namespace KODI
 226 --- xbmc-20.2-Nexus/xbmc/guilib/GUIControl.h.orig       2023-07-26 15:27:08.299092953 +0200
 227 +++ xbmc-20.2-Nexus/xbmc/guilib/GUIControl.h    2023-07-26 19:30:11.865771239 +0200
 228 @@ -381,3 +381,4 @@ protected:
 229    CRect m_renderRegion;         // In screen coordinates
 230  };
 231
 232 +inline int format_as(CGUIControl::GUICONTROLTYPES t) { return static_cast<int>(t); }
 233 --- xbmc-20.2-Nexus/xbmc/input/XBMC_keysym.h.orig       2023-06-29 08:58:06.000000000 +0200
 234 +++ xbmc-20.2-Nexus/xbmc/input/XBMC_keysym.h    2023-07-26 19:31:46.493454221 +0200
 235 @@ -256,6 +256,9 @@ typedef enum
 236    XBMCKMOD_RESERVED = 0x8000
 237  } XBMCMod;
 238
 239 +inline int format_as(XBMCKey m) { return static_cast<int>(m); }
 240 +inline int format_as(XBMCMod m) { return static_cast<int>(m); }
 241 +
 242  #define XBMCKMOD_CTRL (XBMCKMOD_LCTRL | XBMCKMOD_RCTRL)
 243  #define XBMCKMOD_SHIFT (XBMCKMOD_LSHIFT | XBMCKMOD_RSHIFT)
 244  #define XBMCKMOD_ALT (XBMCKMOD_LALT | XBMCKMOD_RALT)
 245 --- xbmc-20.2-Nexus/xbmc/interfaces/IAnnouncer.h.orig   2023-07-26 19:36:15.799128622 +0200
 246 +++ xbmc-20.2-Nexus/xbmc/interfaces/IAnnouncer.h        2023-07-26 20:01:44.124387817 +0200
 247 @@ -77,4 +77,6 @@ namespace ANNOUNCEMENT
 248                            const std::string& message,
 249                            const CVariant& data) = 0;
 250    };
 251 +
 252 +  inline int format_as(AnnouncementFlag f) { return static_cast<int>(f); }
 253  }
 254 --- xbmc-20.2-Nexus/xbmc/InfoScanner.h.orig     2023-06-29 08:58:06.000000000 +0200
 255 +++ xbmc-20.2-Nexus/xbmc/InfoScanner.h  2023-07-26 20:40:51.781241102 +0200
 256 @@ -73,3 +73,5 @@ protected:
 257    bool m_bCanInterrupt = false; //!< Whether or not scanner is currently interruptible
 258    bool m_bClean = false; //!< Whether or not to perform cleaning during scanning
 259  };
 260 +
 261 +inline int format_as(CInfoScanner::INFO_RET r) { return static_cast<int>(r); }
 262 --- xbmc-20.2-Nexus/xbmc/addons/Scraper.h.orig  2023-06-29 08:58:06.000000000 +0200
 263 +++ xbmc-20.2-Nexus/xbmc/addons/Scraper.h       2023-07-26 21:08:55.793347521 +0200
 264 @@ -38,6 +38,8 @@ typedef enum
 265    CONTENT_NONE,
 266  } CONTENT_TYPE;
 267
 268 +inline int format_as(CONTENT_TYPE t) { return static_cast<int>(t); }
 269 +
 270  namespace XFILE
 271  {
 272    class CCurlFile;
 273 --- xbmc-20.2-Nexus/xbmc/cores/VideoPlayer/AudioSinkAE.cpp.orig 2023-06-29 08:58:06.000000000 +0200
 274 +++ xbmc-20.2-Nexus/xbmc/cores/VideoPlayer/AudioSinkAE.cpp      2023-07-26 21:23:36.684530550 +0200
 275 @@ -41,7 +41,7 @@ CAudioSinkAE::~CAudioSinkAE()
 276  bool CAudioSinkAE::Create(const DVDAudioFrame &audioframe, AVCodecID codec, bool needresampler)
 277  {
 278    CLog::Log(LOGINFO, "Creating audio stream (codec id: {}, channels: {}, sample rate: {}, {})",
 279 -            codec, audioframe.format.m_channelLayout.Count(), audioframe.format.m_sampleRate,
 280 +            static_cast<int>(codec), audioframe.format.m_channelLayout.Count(), audioframe.format.m_sampleRate,
 281              audioframe.passthrough ? "pass-through" : "no pass-through");
 282
 283    // if passthrough isset do something else
 284 --- xbmc-20.2-Nexus/xbmc/cores/VideoPlayer/IVideoPlayer.h.orig  2023-06-29 08:58:06.000000000 +0200
 285 +++ xbmc-20.2-Nexus/xbmc/cores/VideoPlayer/IVideoPlayer.h       2023-07-26 21:41:43.644340104 +0200
 286 @@ -56,6 +56,8 @@ protected:
 287    CProcessInfo &m_processInfo;
 288  };
 289
 290 +inline int format_as(IDVDStreamPlayer::ESyncState s) { return static_cast<int>(s); }
 291 +
 292  struct SStartMsg
 293  {
 294    double timestamp;
 295 --- xbmc-20.2-Nexus/xbmc/utils/StreamDetails.h.orig     2023-06-29 08:58:06.000000000 +0200
 296 +++ xbmc-20.2-Nexus/xbmc/utils/StreamDetails.h  2023-07-26 21:18:31.266155633 +0200
 297 @@ -42,6 +42,8 @@ protected:
 298    friend class CStreamDetails;
 299  };
 300
 301 +inline int format_as(CStreamDetail::StreamType t) { return static_cast<int>(t); }
 302 +
 303  class CStreamDetailVideo final : public CStreamDetail
 304  {
 305  public:
 306 --- xbmc-20.2-Nexus/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemux.h.orig  2023-06-29 08:58:06.000000000 +0200
 307 +++ xbmc-20.2-Nexus/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemux.h       2023-07-26 21:46:36.344467442 +0200
 308 @@ -51,6 +51,8 @@ enum StreamType
 309    STREAM_AUDIO_ID3 // Audio ID3 data stream
 310  };
 311
 312 +inline int format_as(StreamType t) { return static_cast<int>(t); }
 313 +
 314  enum StreamSource
 315  {
 316    STREAM_SOURCE_NONE = 0x000,
 317 --- xbmc-20.2-Nexus/xbmc/cores/VideoPlayer/VideoPlayer.cpp.orig 2023-06-29 08:58:06.000000000 +0200
 318 +++ xbmc-20.2-Nexus/xbmc/cores/VideoPlayer/VideoPlayer.cpp      2023-07-26 21:49:26.069356621 +0200
 319 @@ -3078,7 +3078,7 @@ void CVideoPlayer::SetCaching(ECacheStat
 320    if(m_caching == state)
 321      return;
 322
 323 -  CLog::Log(LOGDEBUG, "CVideoPlayer::SetCaching - caching state {}", state);
 324 +  CLog::Log(LOGDEBUG, "CVideoPlayer::SetCaching - caching state {}", static_cast<int>(state));
 325    if (state == CACHESTATE_FULL ||
 326        state == CACHESTATE_INIT)
 327    {
 328 --- xbmc-20.2-Nexus/xbmc/cores/VideoPlayer/DVDMessageQueue.h.orig       2023-06-29 08:58:06.000000000 +0200
 329 +++ xbmc-20.2-Nexus/xbmc/cores/VideoPlayer/DVDMessageQueue.h    2023-07-26 21:59:03.334580262 +0200
 330 @@ -43,6 +43,8 @@ enum MsgQueueReturnCode
 331    MSGQ_OUT_OF_MEMORY = -4
 332  };
 333
 334 +inline int format_as(MsgQueueReturnCode c) { return static_cast<int>(c); }
 335 +
 336  #define MSGQ_IS_ERROR(c)    (c < 0)
 337
 338  class CDVDMessageQueue
 339 --- xbmc-20.2-Nexus/xbmc/cores/VideoPlayer/VideoPlayerAudio.cpp.orig    2023-06-29 08:58:06.000000000 +0200
 340 +++ xbmc-20.2-Nexus/xbmc/cores/VideoPlayer/VideoPlayerAudio.cpp 2023-07-26 21:58:41.306457459 +0200
 341 @@ -76,7 +76,7 @@ CVideoPlayerAudio::~CVideoPlayerAudio()
 342
 343  bool CVideoPlayerAudio::OpenStream(CDVDStreamInfo hints)
 344  {
 345 -  CLog::Log(LOGINFO, "Finding audio codec for: {}", hints.codec);
 346 +  CLog::Log(LOGINFO, "Finding audio codec for: {}", static_cast<int>(hints.codec));
 347    bool allowpassthrough = !CServiceBroker::GetSettingsComponent()->GetSettings()->GetBool(CSettings::SETTING_VIDEOPLAYER_USEDISPLAYASCLOCK);
 348    if (m_processInfo.IsRealtimeStream())
 349      allowpassthrough = false;
 350 --- xbmc-20.2-Nexus/xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp.orig    2023-06-29 08:58:06.000000000 +0200
 351 +++ xbmc-20.2-Nexus/xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp 2023-07-26 21:21:50.821228521 +0200
 352 @@ -118,7 +118,7 @@ bool CVideoPlayerVideo::OpenStream(CDVDS
 353        return false;
 354    }
 355
 356 -  CLog::Log(LOGINFO, "Creating video codec with codec id: {}", hint.codec);
 357 +  CLog::Log(LOGINFO, "Creating video codec with codec id: {}", static_cast<int>(hint.codec));
 358
 359    if (m_messageQueue.IsInited())
 360    {
 361 @@ -158,7 +158,7 @@ bool CVideoPlayerVideo::OpenStream(CDVDS
 362
 363  void CVideoPlayerVideo::OpenStream(CDVDStreamInfo& hint, std::unique_ptr<CDVDVideoCodec> codec)
 364  {
 365 -  CLog::Log(LOGDEBUG, "CVideoPlayerVideo::OpenStream - open stream with codec id: {}", hint.codec);
 366 +  CLog::Log(LOGDEBUG, "CVideoPlayerVideo::OpenStream - open stream with codec id: {}", static_cast<int>(hint.codec));
 367
 368    m_processInfo.GetVideoBufferManager().ReleasePools();
 369
 370 @@ -207,7 +207,7 @@ void CVideoPlayerVideo::OpenStream(CDVDS
 371
 372    if (!codec)
 373    {
 374 -    CLog::Log(LOGINFO, "Creating video codec with codec id: {}", hint.codec);
 375 +    CLog::Log(LOGINFO, "Creating video codec with codec id: {}", static_cast<int>(hint.codec));
 376      hint.codecOptions |= CODEC_ALLOW_FALLBACK;
 377      codec = CDVDFactoryCodec::CreateVideoCodec(hint, m_processInfo);
 378      if (!codec)
 379 --- xbmc-20.2-Nexus/xbmc/cores/VideoPlayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp.orig 2023-06-29 08:58:06.000000000 +0200
 380 +++ xbmc-20.2-Nexus/xbmc/cores/VideoPlayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp      2023-07-26 21:38:03.452136259 +0200
 381 @@ -60,7 +60,7 @@ bool CDVDAudioCodecFFmpeg::Open(CDVDStre
 382
 383    if (!pCodec)
 384    {
 385 -    CLog::Log(LOGDEBUG, "CDVDAudioCodecFFmpeg::Open() Unable to find codec {}", hints.codec);
 386 +    CLog::Log(LOGDEBUG, "CDVDAudioCodecFFmpeg::Open() Unable to find codec {}", static_cast<int>(hints.codec));
 387      return false;
 388    }
 389
 390 --- xbmc-20.2-Nexus/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp.orig     2023-06-29 08:58:06.000000000 +0200
 391 +++ xbmc-20.2-Nexus/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp  2023-07-26 21:47:14.922235289 +0200
 392 @@ -42,7 +42,7 @@ bool CDVDOverlayCodecFFmpeg::Open(CDVDSt
 393    AVCodec* pCodec = avcodec_find_decoder(hints.codec);
 394    if (!pCodec)
 395    {
 396 -    CLog::Log(LOGDEBUG, "{} - Unable to find codec {}", __FUNCTION__, hints.codec);
 397 +    CLog::Log(LOGDEBUG, "{} - Unable to find codec {}", __FUNCTION__, static_cast<int>(hints.codec));
 398      return false;
 399    }
 400
 401 --- xbmc-20.2-Nexus/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp.orig 2023-06-29 08:58:06.000000000 +0200
 402 +++ xbmc-20.2-Nexus/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp      2023-07-26 21:52:39.421345392 +0200
 403 @@ -351,7 +351,7 @@ bool CDVDVideoCodecFFmpeg::Open(CDVDStre
 404
 405    if(pCodec == NULL)
 406    {
 407 -    CLog::Log(LOGDEBUG, "CDVDVideoCodecFFmpeg::Open() Unable to find codec {}", hints.codec);
 408 +    CLog::Log(LOGDEBUG, "CDVDVideoCodecFFmpeg::Open() Unable to find codec {}", static_cast<int>(hints.codec));
 409      return false;
 410    }
 411
 412 @@ -1160,7 +1160,7 @@ int CDVDVideoCodecFFmpeg::FilterOpen(con
 413
 414    std::string args = StringUtils::Format(
 415        "{}:{}:{}:{}:{}:{}:{}", m_pCodecContext->width, m_pCodecContext->height,
 416 -      m_pCodecContext->pix_fmt, m_pCodecContext->time_base.num ? m_pCodecContext->time_base.num : 1,
 417 +      static_cast<int>(m_pCodecContext->pix_fmt), m_pCodecContext->time_base.num ? m_pCodecContext->time_base.num : 1,
 418        m_pCodecContext->time_base.num ? m_pCodecContext->time_base.den : 1,
 419        m_pCodecContext->sample_aspect_ratio.num != 0 ? m_pCodecContext->sample_aspect_ratio.num : 1,
 420        m_pCodecContext->sample_aspect_ratio.num != 0 ? m_pCodecContext->sample_aspect_ratio.den : 1);
 421 --- xbmc-20.2-Nexus/xbmc/cores/VideoPlayer/DVDCodecs/Video/VDPAU.cpp.orig       2023-06-29 08:58:06.000000000 +0200
 422 +++ xbmc-20.2-Nexus/xbmc/cores/VideoPlayer/DVDCodecs/Video/VDPAU.cpp    2023-07-26 21:56:00.658459276 +0200
 423 @@ -207,10 +207,10 @@ bool CVDPAUContext::CreateContext()
 424                                     &m_vdpDevice,
 425                                     &m_vdpProcs.vdp_get_proc_address);
 426
 427 -  CLog::Log(LOGINFO, "vdp_device = {:#08x} vdp_st = {:#08x}", m_vdpDevice, vdp_st);
 428 +  CLog::Log(LOGINFO, "vdp_device = {:#08x} vdp_st = {:#08x}", m_vdpDevice, static_cast<int>(vdp_st));
 429    if (vdp_st != VDP_STATUS_OK)
 430    {
 431 -    CLog::Log(LOGERROR, "(VDPAU) unable to init VDPAU - vdp_st = 0x{:x}.  Falling back.", vdp_st);
 432 +    CLog::Log(LOGERROR, "(VDPAU) unable to init VDPAU - vdp_st = 0x{:x}.  Falling back.", static_cast<int>(vdp_st));
 433      m_vdpDevice = VDP_INVALID_HANDLE;
 434      return false;
 435    }
 436 @@ -588,7 +588,7 @@ bool CDecoder::Open(AVCodecContext* avct
 437        if (CheckStatus(vdp_st, __LINE__))
 438        {
 439          CLog::Log(LOGERROR, "VDPAU::Open: error {}({}) checking for decoder support",
 440 -                  m_vdpauConfig.context->GetProcs().vdp_get_error_string(vdp_st), vdp_st);
 441 +                  m_vdpauConfig.context->GetProcs().vdp_get_error_string(vdp_st), static_cast<int>(vdp_st));
 442          return false;
 443        }
 444
 445 @@ -611,7 +611,7 @@ bool CDecoder::Open(AVCodecContext* avct
 446        if (CheckStatus(vdp_st, __LINE__))
 447        {
 448          CLog::Log(LOGERROR, "VDPAU::Open: error: {}({}) checking for decoder support",
 449 -                  m_vdpauConfig.context->GetProcs().vdp_get_error_string(vdp_st), vdp_st);
 450 +                  m_vdpauConfig.context->GetProcs().vdp_get_error_string(vdp_st), static_cast<int>(vdp_st));
 451          return false;
 452        }
 453
 454 @@ -1312,7 +1312,7 @@ bool CDecoder::CheckStatus(VdpStatus vdp
 455    if (vdp_st != VDP_STATUS_OK)
 456    {
 457      CLog::Log(LOGERROR, " (VDPAU) Error: {}({}) at {}:{}",
 458 -              m_vdpauConfig.context->GetProcs().vdp_get_error_string(vdp_st), vdp_st, __FILE__,
 459 +              m_vdpauConfig.context->GetProcs().vdp_get_error_string(vdp_st), static_cast<int>(vdp_st), __FILE__,
 460                line);
 461
 462      m_ErrorCount++;
 463 @@ -2820,7 +2820,7 @@ bool CMixer::CheckStatus(VdpStatus vdp_s
 464    if (vdp_st != VDP_STATUS_OK)
 465    {
 466      CLog::Log(LOGERROR, " (VDPAU) Error: {}({}) at {}:{}",
 467 -              m_config.context->GetProcs().vdp_get_error_string(vdp_st), vdp_st, __FILE__, line);
 468 +              m_config.context->GetProcs().vdp_get_error_string(vdp_st), static_cast<int>(vdp_st), __FILE__, line);
 469      m_vdpError = true;
 470      return true;
 471    }
 472 @@ -3456,7 +3456,7 @@ bool COutput::CheckStatus(VdpStatus vdp_
 473    if (vdp_st != VDP_STATUS_OK)
 474    {
 475      CLog::Log(LOGERROR, " (VDPAU) Error: {}({}) at {}:{}",
 476 -              m_config.context->GetProcs().vdp_get_error_string(vdp_st), vdp_st, __FILE__, line);
 477 +              m_config.context->GetProcs().vdp_get_error_string(vdp_st), static_cast<int>(vdp_st), __FILE__, line);
 478      m_vdpError = true;
 479      return true;
 480    }
 481 --- xbmc-20.2-Nexus/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp.orig       2023-06-29 08:58:06.000000000 +0200
 482 +++ xbmc-20.2-Nexus/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp    2023-07-26 21:58:35.749234205 +0200
 483 @@ -250,7 +250,7 @@ bool CDVDVideoCodecDRMPRIME::Open(CDVDSt
 484    if (!pCodec)
 485    {
 486      CLog::Log(LOGDEBUG, "CDVDVideoCodecDRMPRIME::{} - unable to find decoder for codec {}",
 487 -              __FUNCTION__, hints.codec);
 488 +              __FUNCTION__, static_cast<int>(hints.codec));
 489      return false;
 490    }
 491
 492 --- xbmc-20.2-Nexus/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxClient.cpp.orig  2023-06-29 08:58:06.000000000 +0200
 493 +++ xbmc-20.2-Nexus/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxClient.cpp       2023-07-26 21:24:17.068367976 +0200
 494 @@ -620,7 +620,7 @@ void CDVDDemuxClient::SetStreamProps(CDe
 495    toStream->name = stream->name;
 496
 497    CLog::Log(LOGDEBUG, "CDVDDemuxClient::RequestStream(): added/updated stream {} with codec_id {}",
 498 -            toStream->uniqueId, toStream->codec);
 499 +            toStream->uniqueId, static_cast<int>(toStream->codec));
 500  }
 501
 502  std::shared_ptr<CDemuxStream> CDVDDemuxClient::GetStreamInternal(int iStreamId)
 503 --- xbmc-20.2-Nexus/xbmc/cores/VideoPlayer/VideoRenderers/BaseRenderer.cpp.orig 2023-06-29 08:58:06.000000000 +0200
 504 +++ xbmc-20.2-Nexus/xbmc/cores/VideoPlayer/VideoRenderers/BaseRenderer.cpp      2023-07-26 21:26:41.852506893 +0200
 505 @@ -370,7 +370,7 @@ EShaderFormat CBaseRenderer::GetShaderFo
 506    else if (m_format == AV_PIX_FMT_UYVY422)
 507      ret = SHADER_UYVY;
 508    else
 509 -    CLog::Log(LOGERROR, "CBaseRenderer::GetShaderFormat - unsupported format {}", m_format);
 510 +    CLog::Log(LOGERROR, "CBaseRenderer::GetShaderFormat - unsupported format {}", static_cast<int>(m_format));
 511
 512    return ret;
 513  }
 514 --- xbmc-20.2-Nexus/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h.orig   2023-06-29 08:58:06.000000000 +0200
 515 +++ xbmc-20.2-Nexus/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h        2023-07-26 21:32:38.594478637 +0200
 516 @@ -62,6 +62,8 @@ enum CMS_TRC_TYPE
 517    CMS_TRC_COUNT
 518  };
 519
 520 +inline int format_as(CMS_TRC_TYPE t) { return static_cast<int>(t); }
 521 +
 522  class CColorManager
 523  {
 524  public:
 525 --- xbmc-20.2-Nexus/xbmc/input/touch/ITouchInputHandler.h.orig  2023-06-29 08:58:06.000000000 +0200
 526 +++ xbmc-20.2-Nexus/xbmc/input/touch/ITouchInputHandler.h       2023-07-26 21:40:59.350573619 +0200
 527 @@ -26,6 +26,8 @@ typedef enum
 528    TouchInputMove
 529  } TouchInput;
 530
 531 +inline int format_as(TouchInput ti) { return static_cast<int>(ti); }
 532 +
 533  /*!
 534   * \ingroup touch
 535   * \brief Interface (implements ITouchInputHandling) defining methods to handle