fandangos · ktheticdev · Mar 1, 2024 · Mar 2, 2024 · Mar 2, 2024 · Mar 2, 2024
diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po
@@ -23996,11 +23996,7 @@ msgctxt "#40032"
 msgid "No similar movies were found in the library."
 msgstr ""
 
-#. Addition of new version: a movie with multiple versions cannot be turned into a version of another movie.
-#: xbmc/video/dialogs/GUIDialogVideoManagerVersions.cpp
-msgctxt "#40033"
-msgid "The default version of a movie with multiple versions cannot be added as a version to another movie. Please add its additional versions first."
-msgstr ""
+#empty string id 40033
 
 #. Addition of new extra: a movie with multiple versions cannot be turned into an extra of another movie.
 #: xbmc/video/dialogs/GUIDialogVideoManagerExtras.cpp

diff --git a/cmake/scripts/linux/Install.cmake b/cmake/scripts/linux/Install.cmake
@@ -134,6 +134,10 @@ install(FILES ${CMAKE_SOURCE_DIR}/tools/Linux/packaging/media/icon256x256.png
         RENAME ${APP_NAME_LC}.png
         DESTINATION ${datarootdir}/icons/hicolor/256x256/apps
         COMPONENT kodi)
+install(FILES ${CMAKE_SOURCE_DIR}/tools/Linux/packaging/media/iconScalable.svg
+        RENAME ${APP_NAME_LC}.png
+        DESTINATION ${datarootdir}/icons/hicolor/scalable/apps
+        COMPONENT kodi)
 
 # Install firewalld service definitions
 install(FILES ${CMAKE_SOURCE_DIR}/tools/Linux/firewalld-services/kodi-eventserver.xml

diff --git a/cmake/scripts/windowsstore/Install.cmake b/cmake/scripts/windowsstore/Install.cmake
@@ -10,7 +10,7 @@ foreach(uwp_pythonlibinit_file \$\{uwp_pythonlibinit_foundfiles\})
     file(SIZE \"\$\{uwp_pythonlibinit_file\}\" uwp_pythonlibinit_filesize)
     if(\$\{uwp_pythonlibinit_filesize\} EQUAL 0)
         message(\"Adding hash comment character in the following empty file: \$\{uwp_pythonlibinit_file\}\")
-        file(APPEND ${uwp_pythonlibinit_file} \"#\")
+        file(APPEND \$\{uwp_pythonlibinit_file\} \"#\")
     endif()
 endforeach()\n")
 

diff --git a/media/splash.jpg b/media/splash.jpg
diff --git a/system/settings/settings.xml b/system/settings/settings.xml
@@ -2998,7 +2998,12 @@
         <control type="toggle" />
       </setting>
       <setting id="videoscreen.guipeakluminance" type="integer" label="36097" help="36547">
-        <requirement>HAS_DX</requirement>
+        <requirement>
+          <or>
+            <condition>HAS_DX</condition>
+            <condition>HAS_MEDIACODEC</condition>
+          </or>
+        </requirement>
         <dependencies>
           <dependency type="visible" on="property" name="ishdrdisplay"/>
           <dependency type="enable">

diff --git a/system/shaders/GLES/2.0/gles_shader_default.frag b/system/shaders/GLES/2.0/gles_shader_default.frag
@@ -22,6 +22,7 @@
 
 precision mediump float;
 uniform lowp vec4 m_unicol;
+uniform float m_sdrPeak;
 
 void main ()
 {
@@ -34,5 +35,9 @@ void main ()
   rgb.rgb += 16.0 / 255.0;
 #endif
 
+#if defined(KODI_TRANSFER_PQ)
+  rgb.rgb *= m_sdrPeak;
+#endif
+
   gl_FragColor = rgb;
 }
diff --git a/system/shaders/GLES/2.0/gles_shader_fonts.frag b/system/shaders/GLES/2.0/gles_shader_fonts.frag
@@ -24,6 +24,7 @@ precision mediump float;
 uniform sampler2D m_samp0;
 varying vec4 m_cord0;
 varying lowp vec4 m_colour;
+uniform float m_sdrPeak;
 
 void main ()
 {
@@ -37,5 +38,9 @@ void main ()
   rgb.rgb += 16.0 / 255.0;
 #endif
 
+#if defined(KODI_TRANSFER_PQ)
+  rgb.rgb *= m_sdrPeak;
+#endif
+
   gl_FragColor = rgb;
 }
diff --git a/system/shaders/GLES/2.0/gles_shader_multi.frag b/system/shaders/GLES/2.0/gles_shader_multi.frag
@@ -25,6 +25,7 @@ uniform sampler2D m_samp0;
 uniform sampler2D m_samp1;
 varying vec4 m_cord0;
 varying vec4 m_cord1;
+uniform float m_sdrPeak;
 
 void main ()
 {
@@ -37,5 +38,9 @@ void main ()
   rgb.rgb += 16.0 / 255.0;
 #endif
 
+#if defined(KODI_TRANSFER_PQ)
+  rgb.rgb *= m_sdrPeak;
+#endif
+
   gl_FragColor = rgb;
 }
diff --git a/system/shaders/GLES/2.0/gles_shader_multi_blendcolor.frag b/system/shaders/GLES/2.0/gles_shader_multi_blendcolor.frag
@@ -26,6 +26,7 @@ uniform sampler2D m_samp1;
 varying vec4 m_cord0;
 varying vec4 m_cord1;
 uniform lowp vec4 m_unicol;
+uniform float m_sdrPeak;
 
 void main ()
 {
@@ -38,5 +39,9 @@ void main ()
   rgb.rgb += 16.0 / 255.0;
 #endif
 
+#if defined(KODI_TRANSFER_PQ)
+  rgb.rgb *= m_sdrPeak;
+#endif
+
   gl_FragColor = rgb;
 }
diff --git a/system/shaders/GLES/2.0/gles_shader_texture.frag b/system/shaders/GLES/2.0/gles_shader_texture.frag
@@ -24,6 +24,7 @@ precision mediump float;
 uniform sampler2D m_samp0;
 uniform lowp vec4 m_unicol;
 varying vec4 m_cord0;
+uniform float m_sdrPeak;
 
 void main ()
 {
@@ -36,5 +37,9 @@ void main ()
   rgb.rgb += 16.0 / 255.0;
 #endif
 
+#if defined(KODI_TRANSFER_PQ)
+  rgb.rgb *= m_sdrPeak;
+#endif
+
   gl_FragColor = rgb;
 }
diff --git a/system/shaders/GLES/2.0/gles_shader_texture_noalpha.frag b/system/shaders/GLES/2.0/gles_shader_texture_noalpha.frag
@@ -11,6 +11,7 @@
 precision mediump float;
 uniform sampler2D m_samp0;
 varying vec4 m_cord0;
+uniform float m_sdrPeak;
 
 void main ()
 {
@@ -21,5 +22,9 @@ void main ()
   rgb += 16.0 / 255.0;
 #endif
 
+#if defined(KODI_TRANSFER_PQ)
+  rgb.rgb *= m_sdrPeak;
+#endif
+
   gl_FragColor = vec4(rgb, 1.0);
 }
diff --git a/system/shaders/GLES/2.0/gles_shader_texture_noblend.frag b/system/shaders/GLES/2.0/gles_shader_texture_noblend.frag
@@ -23,6 +23,7 @@
 precision mediump float;
 uniform sampler2D m_samp0;
 varying vec4 m_cord0;
+uniform float m_sdrPeak;
 
 void main ()
 {
@@ -35,5 +36,9 @@ void main ()
   rgb.rgb += 16.0 / 255.0;
 #endif
 
+#if defined(KODI_TRANSFER_PQ)
+  rgb.rgb *= m_sdrPeak;
+#endif
+
   gl_FragColor = rgb;
 }
diff --git a/tools/Linux/kodi.metainfo.xml.in b/tools/Linux/kodi.metainfo.xml.in
@@ -78,7 +78,10 @@
         </screenshot>
     </screenshots>
     <releases>
-        <release date="2023-02-15" version="21.0~b3-Omega" type="development"><url>https://kodi.tv/article/kodi-omega-beta-3/</url></release>
+        <release date="2024-04-06" version="21.0-Omega" type="stable"><url>https://kodi.tv/article/kodi-21-0-omega-release/</url></release>
+        <release date="2024-03-18" version="21.0~rc2-Omega" type="development"><url>https://kodi.tv/article/kodi-omega-rc-2/</url></release>
+        <release date="2024-03-07" version="21.0~rc1-Omega" type="development"><url>https://kodi.tv/article/kodi-omega-rc-1/</url></release>
+        <release date="2024-02-15" version="21.0~b3-Omega" type="development"><url>https://kodi.tv/article/kodi-omega-beta-3/</url></release>
         <release date="2023-12-09" version="21.0~b2-Omega" type="development"><url>https://kodi.tv/article/kodi-omega-beta-2/</url></release>
         <release date="2023-10-17" version="21.0~b1-Omega" type="development"><url>https://kodi.tv/article/kodi-omega-beta-1/</url></release>
         <release date="2023-09-07" version="21.0~a3-Omega" type="development"><url>https://kodi.tv/article/kodi-omega-alpha-3/</url></release>

diff --git a/tools/Linux/packaging/media/iconScalable.svg b/tools/Linux/packaging/media/iconScalable.svg
diff --git a/tools/android/packaging/xbmc/build.gradle.in b/tools/android/packaging/xbmc/build.gradle.in
@@ -56,6 +56,6 @@ project.afterEvaluate {
 
 dependencies {
     // New support library to for channels/programs development.
-    implementation 'androidx.tvprovider:tvprovider:1.0.0'
+    implementation 'androidx.tvprovider:tvprovider:1.1.0-alpha01'
     implementation 'com.google.code.gson:gson:2.10.1'
 }
diff --git a/tools/depends/native/pkg-config/Makefile b/tools/depends/native/pkg-config/Makefile
@@ -17,6 +17,10 @@ ifeq ($(CROSS_COMPILING),no)
 PC_PATH:=$(PC_PATH):/usr/lib/pkgconfig:/usr/lib/$(HOST)/pkgconfig:/usr/share/pkgconfig
 endif
 
+# LLVM 15 has raised this to error by default. drop back to warning
+CFLAGS=$(NATIVE_CFLAGS) -Wno-error=int-conversion
+export CFLAGS
+
 # configuration settings
 CONFIGURE=./configure --prefix=$(PREFIX) --enable-indirect-deps --with-pc-path=$(PC_PATH) --with-internal-glib
 LIBDYLIB=$(PLATFORM)/pkg-config

diff --git a/tools/depends/target/gnutls/Makefile b/tools/depends/target/gnutls/Makefile
@@ -34,6 +34,10 @@ CONFIGURE=./configure --prefix=$(PREFIX) \
                       --without-idn \
                       $(CONFIGURE_OPTIONS)
 
+# LLVM 15 has raised this to error by default. drop back to warning
+CFLAGS+= -Wno-error=implicit-int
+export CFLAGS
+
 LIBDYLIB=$(PLATFORM)/lib/.libs/lib$(LIBNAME).a
 
 all: .installed-$(PLATFORM)

diff --git a/tools/depends/target/openssl/Makefile b/tools/depends/target/openssl/Makefile
@@ -21,6 +21,8 @@ else
     endif
   endif
   ifeq ($(OS), darwin_embedded)
+    # LLVM 15 has raised this to error by default. drop back to warning
+    CFLAGS+= -Wno-error=implicit-int
     export SDKROOT CFLAGS
     OPENSSLPLATFORM=kodi-$(TARGET_PLATFORM)-$(CPU)
     ifeq ($(TARGET_PLATFORM),appletvos)

diff --git a/tools/depends/target/samba-gplv3/Makefile b/tools/depends/target/samba-gplv3/Makefile
@@ -52,6 +52,9 @@ else
   endif
 endif
 
+# LLVM 15 has raised this to error by default. drop back to warning
+CFLAGS+= -Wno-error=int-conversion
+
 export PERL5LIB:=$(PERLMODULE):$(PERL5LIB)
 
 export CC CXX CPP AR RANLIB LD AS NM STRIP TOOLCHAIN

diff --git a/version.txt b/version.txt
@@ -8,9 +8,9 @@ COPYRIGHT_YEARS 2005-2021
 WEBSITE http://kodi.tv
 VERSION_MAJOR 21
 VERSION_MINOR 0
-VERSION_TAG BETA3
-VERSION_CODE 20.90.830
-ADDON_API 20.90.830
+VERSION_TAG
+VERSION_CODE 21.0.0
+ADDON_API 21.0.0
 ADDON_REPOS repository.xbmc.org|https://mirrors.kodi.tv
 APP_PACKAGE org.xbmc.kodi.fandangos
 PACKAGE_IDENTITY XBMCFoundation.Kodi

diff --git a/xbmc/GUIInfoManager.cpp b/xbmc/GUIInfoManager.cpp
@@ -802,7 +802,7 @@ const infomap integer_bools[] =  {{ "isequal",          INTEGER_IS_EQUAL },
 ///     @deprecated \link Player_Cutlist `Player.Cutlist`\endlink is deprecated and will be removed in the next version.
 ///     <p><hr>
 ///     @skinning_v19 **[New Infolabel]** \link Player_Cutlist `Player.Cutlist`\endlink
-///     @skinning_v20 \link Player_Cutlist `Player.Cutlist`\endlink is deprecated\, use \link Player_Editlist `Player.Editlist`\endlink instead
+///     @skinning_v20 \link Player_Cutlist `Player.Cutlist`\endlink is deprecated\, use \link Player_Cuts `Player.Cuts`\endlink instead
 ///     <p>
 ///   }
 ///   \table_row3{   <b>`Player.Editlist`</b>,
@@ -5207,9 +5207,6 @@ const infomap container_str[]  = {{ "property",         CONTAINER_PROPERTY },
 ///     <p>
 ///     @deprecated \link ListItem_PictureColour `ListItem.PictureColour`\endlink is deprecated and will be removed in future Kodi versions
 ///     <p><hr>
-///     @skinning_v20 **[Deprecated]** \link ListItem_PictureColour `ListItem.PictureColour`\endlink is deprecated and will be removed in future Kodi versions
-///     <p>
-///     <p><hr>
 ///     @skinning_v13 **[New Infolabel]** \link ListItem_PictureColour `ListItem.PictureColour`\endlink
 ///     <p>
 ///   }
@@ -5530,9 +5527,6 @@ const infomap container_str[]  = {{ "property",         CONTAINER_PROPERTY },
 ///     <p>
 ///     @deprecated \link ListItem_PictureProcess `ListItem.PictureProcess`\endlink is deprecated and will be removed in future Kodi versions
 ///     <p><hr>
-///     @skinning_v20 **[Deprecated]** \link ListItem_PictureProcess `ListItem.PictureProcess`\endlink is deprecated and will be removed in future Kodi versions
-///     <p>
-///     <p><hr>
 ///     @skinning_v13 **[New Infolabel]** \link ListItem_PictureProcess `ListItem.PictureProcess`\endlink
 ///     <p>
 ///   }
@@ -9138,9 +9132,6 @@ const infomap rds[] =            {{ "hasrds",                   RDS_HAS_RDS },
 ///     <p>
 ///     @deprecated Slideshow_Colour `Slideshow.Colour`\endlink is deprecated and will be removed in future Kodi versions
 ///     <p><hr>
-///     @skinning_v20 **[Deprecated]** \link Slideshow_Colour `Slideshow.Colour`\endlink is deprecated and will be removed in future Kodi versions
-///     <p>
-///     <p><hr>
 ///     @skinning_v13 **[New Infolabel]** \link Slideshow_Colour `Slideshow.Colour`\endlink
 ///     <p>
 ///   }
@@ -9472,9 +9463,6 @@ const infomap rds[] =            {{ "hasrds",                   RDS_HAS_RDS },
 ///     <p>
 ///     @deprecated \link Slideshow_Process `Slideshow.Process`\endlink is deprecated and will be removed in future Kodi versions
 ///     <p><hr>
-///     @skinning_v20 **[Deprecated]** \link Slideshow_Process `Slideshow.Process`\endlink is deprecated and will be removed in future Kodi versions
-///     <p>
-///     <p><hr>
 ///     @skinning_v13 **[New Infolabel]** \link Slideshow_Process `Slideshow.Process`\endlink
 ///     <p>
 ///   }

diff --git a/xbmc/addons/AddonManager.cpp b/xbmc/addons/AddonManager.cpp
@@ -249,7 +249,6 @@ std::vector<std::shared_ptr<IAddon>> CAddonMgr::GetOutdatedAddons() const
 std::vector<std::shared_ptr<IAddon>> CAddonMgr::GetAvailableUpdatesOrOutdatedAddons(
     AddonCheckType addonCheckType) const
 {
-  std::unique_lock<CCriticalSection> lock(m_critSection);
   auto start = std::chrono::steady_clock::now();
 
   std::vector<std::shared_ptr<IAddon>> result;