diff -Nru kodi-20.0+git20221119.2122-79cc796503/BUILDDATE kodi-20.0+git20221121.0300-41de6b9949/BUILDDATE --- kodi-20.0+git20221119.2122-79cc796503/BUILDDATE 2013-05-12 08:41:54.000000000 +0000 +++ kodi-20.0+git20221121.0300-41de6b9949/BUILDDATE 2013-05-12 08:41:54.000000000 +0000 @@ -1 +1 @@ -20221119 +20221121 diff -Nru kodi-20.0+git20221119.2122-79cc796503/cmake/modules/buildtools/FindFlatC.cmake kodi-20.0+git20221121.0300-41de6b9949/cmake/modules/buildtools/FindFlatC.cmake --- kodi-20.0+git20221119.2122-79cc796503/cmake/modules/buildtools/FindFlatC.cmake 2013-05-12 08:41:54.000000000 +0000 +++ kodi-20.0+git20221121.0300-41de6b9949/cmake/modules/buildtools/FindFlatC.cmake 2013-05-12 08:41:54.000000000 +0000 @@ -4,8 +4,9 @@ # # This will define the following variables: # -# FLATBUFFERS_FOUND - system has FlatBuffers compiler and headers +# FLATBUFFERS_FLATC_EXECUTABLE_FOUND - system has FlatBuffers compiler # FLATBUFFERS_FLATC_EXECUTABLE - the flatc compiler executable +# FLATBUFFERS_FLATC_VERSION - the flatc compiler version # # and the following imported targets: # @@ -13,15 +14,24 @@ include(cmake/scripts/common/ModuleHelpers.cmake) -set(MODULE_LC flatbuffers) - -SETUP_BUILD_VARS() - # Check for existing FLATC. find_program(FLATBUFFERS_FLATC_EXECUTABLE NAMES flatc HINTS ${NATIVEPREFIX}/bin) -if(NOT FLATBUFFERS_FLATC_EXECUTABLE) +if(FLATBUFFERS_FLATC_EXECUTABLE) + execute_process(COMMAND "${FLATBUFFERS_FLATC_EXECUTABLE}" --version + OUTPUT_VARIABLE FLATBUFFERS_FLATC_VERSION + OUTPUT_STRIP_TRAILING_WHITESPACE) + string(REGEX MATCH "[^\n]* version [^\n]*" FLATBUFFERS_FLATC_VERSION "${FLATBUFFERS_FLATC_VERSION}") + string(REGEX REPLACE ".* version (.*)" "\\1" FLATBUFFERS_FLATC_VERSION "${FLATBUFFERS_FLATC_VERSION}") + +else() + + set(MODULE_LC flatbuffers) + # Duplicate URL may exist from FindFlatbuffers.cmake + # unset otherwise it thinks we are providing a local file location and incorrect concatenation happens + unset(FLATBUFFERS_URL) + SETUP_BUILD_VARS() # Override build type detection and always build as release set(FLATBUFFERS_BUILD_TYPE Release) @@ -57,6 +67,7 @@ set(BUILD_NAME flatc) set(BUILD_BYPRODUCTS ${FLATBUFFERS_FLATC_EXECUTABLE}) + set(FLATBUFFERS_FLATC_VERSION ${FLATBUFFERS_VER}) BUILD_DEP_TARGET() endif() @@ -64,7 +75,7 @@ include(FindPackageHandleStandardArgs) find_package_handle_standard_args(FlatC REQUIRED_VARS FLATBUFFERS_FLATC_EXECUTABLE - VERSION_VAR FLATBUFFERS_VER) + VERSION_VAR FLATBUFFERS_FLATC_VERSION) if(FLATC_FOUND) diff -Nru kodi-20.0+git20221119.2122-79cc796503/cmake/modules/FindFlatBuffers.cmake kodi-20.0+git20221121.0300-41de6b9949/cmake/modules/FindFlatBuffers.cmake --- kodi-20.0+git20221119.2122-79cc796503/cmake/modules/FindFlatBuffers.cmake 2013-05-12 08:41:54.000000000 +0000 +++ kodi-20.0+git20221121.0300-41de6b9949/cmake/modules/FindFlatBuffers.cmake 2013-05-12 08:41:54.000000000 +0000 @@ -5,10 +5,11 @@ # This will define the following variables: # # FLATBUFFERS_FOUND - system has FlatBuffers compiler and headers -# FLATBUFFERS_FLATC_EXECUTABLE - the flatc compiler executable # FLATBUFFERS_INCLUDE_DIRS - the FlatFuffers include directory # FLATBUFFERS_MESSAGES_INCLUDE_DIR - the directory for generated headers +find_package(FlatC REQUIRED) + if(ENABLE_INTERNAL_FLATBUFFERS) include(cmake/scripts/common/ModuleHelpers.cmake) diff -Nru kodi-20.0+git20221119.2122-79cc796503/debian/changelog kodi-20.0+git20221121.0300-41de6b9949/debian/changelog --- kodi-20.0+git20221119.2122-79cc796503/debian/changelog 2013-05-12 08:41:54.000000000 +0000 +++ kodi-20.0+git20221121.0300-41de6b9949/debian/changelog 2013-05-12 08:41:54.000000000 +0000 @@ -1,4 +1,4 @@ -kodi (6:20.0+git20221119.2122-79cc796503-0~jammy) jammy; urgency=medium +kodi (6:20.0+git20221121.0300-41de6b9949-0~jammy) jammy; urgency=medium [ kodi ] * autogenerated dummy changelog diff -Nru kodi-20.0+git20221119.2122-79cc796503/VERSION kodi-20.0+git20221121.0300-41de6b9949/VERSION --- kodi-20.0+git20221119.2122-79cc796503/VERSION 2013-05-12 08:41:54.000000000 +0000 +++ kodi-20.0+git20221121.0300-41de6b9949/VERSION 2013-05-12 08:41:54.000000000 +0000 @@ -1 +1 @@ -79cc796503 +41de6b9949 diff -Nru kodi-20.0+git20221119.2122-79cc796503/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp kodi-20.0+git20221121.0300-41de6b9949/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp --- kodi-20.0+git20221119.2122-79cc796503/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp 2013-05-12 08:41:54.000000000 +0000 +++ kodi-20.0+git20221121.0300-41de6b9949/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp 2013-05-12 08:41:54.000000000 +0000 @@ -1368,7 +1368,10 @@ /* "HDA NVidia", "HDA Intel", "HDA ATI HDMI", "SB Live! 24-bit External", ... */ char *cardName; if (snd_card_get_name(cardNr, &cardName) == 0) + { info.m_displayName = cardName; + free(cardName); + } if (info.m_deviceType == AE_DEVTYPE_HDMI && info.m_displayName.size() > 5 && info.m_displayName.substr(info.m_displayName.size()-5) == " HDMI") diff -Nru kodi-20.0+git20221119.2122-79cc796503/xbmc/guilib/GUIBaseContainer.cpp kodi-20.0+git20221121.0300-41de6b9949/xbmc/guilib/GUIBaseContainer.cpp --- kodi-20.0+git20221119.2122-79cc796503/xbmc/guilib/GUIBaseContainer.cpp 2013-05-12 08:41:54.000000000 +0000 +++ kodi-20.0+git20221121.0300-41de6b9949/xbmc/guilib/GUIBaseContainer.cpp 2013-05-12 08:41:54.000000000 +0000 @@ -421,8 +421,8 @@ case ACTION_PLAYER_PLAY: if (m_listProvider) { - const size_t selected = GetSelectedItem(); - if (selected >= 0 && selected < m_items.size()) + const int selected = GetSelectedItem(); + if (selected >= 0 && selected < static_cast(m_items.size())) { if (m_listProvider->OnPlay(m_items[selected])) return true; diff -Nru kodi-20.0+git20221119.2122-79cc796503/xbmc/windowing/X11/WinSystemX11.cpp kodi-20.0+git20221121.0300-41de6b9949/xbmc/windowing/X11/WinSystemX11.cpp --- kodi-20.0+git20221119.2122-79cc796503/xbmc/windowing/X11/WinSystemX11.cpp 2013-05-12 08:41:54.000000000 +0000 +++ kodi-20.0+git20221121.0300-41de6b9949/xbmc/windowing/X11/WinSystemX11.cpp 2013-05-12 08:41:54.000000000 +0000 @@ -845,6 +845,8 @@ class_hints); XFree(class_hints); XFree(wm_hints); + XFree(iconName.value); + XFree(windowName.value); // register interest in the delete window message Atom wmDeleteMessage = XInternAtom(m_dpy, "WM_DELETE_WINDOW", False);