From ef05fc26c6e092330e503a297946a2e15140e141 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Sat, 18 Apr 2020 22:14:03 +0100 Subject: [PATCH 01/13] kodi (default): update to kodi-392dcf7 --- packages/mediacenter/kodi/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk index 9a09d380bd..45517b56c0 100644 --- a/packages/mediacenter/kodi/package.mk +++ b/packages/mediacenter/kodi/package.mk @@ -19,8 +19,8 @@ case $KODI_VENDOR in PKG_SOURCE_NAME="kodi-$KODI_VENDOR-$PKG_VERSION.tar.gz" ;; *) - PKG_VERSION="3375a26606b3a6913bea18f4ef7b85a72b724915" - PKG_SHA256="995c9f78143d1c96a0ae1d6dc4ad8c49e9a2f24047f9569130675dfc08797cb2" + PKG_VERSION="392dcf7331e06afda77d957d12664d3e1dc6c714" + PKG_SHA256="7ecc55d7c2930efbf0156d74a341a58b8580dd05226bef63768702ae3892b7ae" PKG_URL="https://github.com/xbmc/xbmc/archive/$PKG_VERSION.tar.gz" PKG_SOURCE_NAME="kodi-$PKG_VERSION.tar.gz" ;; From 32c4ca12a5a1338467d7482510616c6072f3a7a3 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Sun, 19 Apr 2020 18:32:16 +0100 Subject: [PATCH 02/13] kodi (RPi/RPi2/RPi4): update to kodi-newclock5_20200419 --- packages/mediacenter/kodi/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk index 45517b56c0..072547f450 100644 --- a/packages/mediacenter/kodi/package.mk +++ b/packages/mediacenter/kodi/package.mk @@ -13,8 +13,8 @@ PKG_PATCH_DIRS="$KODI_VENDOR" case $KODI_VENDOR in raspberrypi) - PKG_VERSION="78f79b5700b90f402da48190ee00dd08d3d6c594" - PKG_SHA256="e4638c5bcd0325709bb5eaa5ca47765652df89bd91446558b9a936740cc4c95c" + PKG_VERSION="newclock5_20200419" + PKG_SHA256="f50ea08a4f7f4dc2083c8470115063eaeb67c9b8682ecc6bfaf42dafcb69fd5c" PKG_URL="https://github.com/popcornmix/xbmc/archive/$PKG_VERSION.tar.gz" PKG_SOURCE_NAME="kodi-$KODI_VENDOR-$PKG_VERSION.tar.gz" ;; From d31d6f672e950ba1480ea9c4aec95f51928b422d Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Mon, 9 Mar 2020 10:13:11 +0000 Subject: [PATCH 03/13] kodi: ensure we use our swig, not system --- packages/mediacenter/kodi/package.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk index 072547f450..f78296fe43 100644 --- a/packages/mediacenter/kodi/package.mk +++ b/packages/mediacenter/kodi/package.mk @@ -210,6 +210,7 @@ configure_package() { -DWITH_TEXTUREPACKER=$TOOLCHAIN/bin/TexturePacker \ -DWITH_JSONSCHEMABUILDER=$TOOLCHAIN/bin/JsonSchemaBuilder \ -DDEPENDS_PATH=$PKG_BUILD/depends \ + -DSWIG_EXECUTABLE=$TOOLCHAIN/bin/swig \ -DPYTHON_EXECUTABLE=$TOOLCHAIN/bin/$PKG_PYTHON_VERSION \ -DPYTHON_INCLUDE_DIRS=$SYSROOT_PREFIX/usr/include/$PKG_PYTHON_VERSION \ -DGIT_VERSION=$PKG_VERSION \ From bca99a1c0bcda60ae127f0e252c6a4b7b8d5156e Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Fri, 13 Mar 2020 19:46:24 +0000 Subject: [PATCH 04/13] screensaver.pingpong: add glm dependency --- .../kodi-binary-addons/screensaver.pingpong/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mediacenter/kodi-binary-addons/screensaver.pingpong/package.mk b/packages/mediacenter/kodi-binary-addons/screensaver.pingpong/package.mk index 7b00d3ad4a..98cff0dbd4 100644 --- a/packages/mediacenter/kodi-binary-addons/screensaver.pingpong/package.mk +++ b/packages/mediacenter/kodi-binary-addons/screensaver.pingpong/package.mk @@ -10,7 +10,7 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/xbmc/screensaver.pingpong" PKG_URL="https://github.com/xbmc/screensaver.pingpong/archive/$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain kodi-platform" +PKG_DEPENDS_TARGET="toolchain kodi-platform glm" PKG_SECTION="" PKG_SHORTDESC="screensaver.pingpong" PKG_LONGDESC="screensaver.pingpong" From 64e58b4c2f743ede08c7fd22cc5a2a84a9913468 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Sun, 5 Apr 2020 03:06:36 +0100 Subject: [PATCH 05/13] libudfread: new package --- packages/multimedia/libudfread/package.mk | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 packages/multimedia/libudfread/package.mk diff --git a/packages/multimedia/libudfread/package.mk b/packages/multimedia/libudfread/package.mk new file mode 100644 index 0000000000..0e9b312bd1 --- /dev/null +++ b/packages/multimedia/libudfread/package.mk @@ -0,0 +1,14 @@ +# SPDX-License-Identifier: GPL-2.0 +# Copyright (C) 2020-present Team LibreELEC (https://libreelec.tv) + +PKG_NAME="libudfread" +PKG_VERSION="1.0.0" +PKG_SHA256="539dd69d2f43816a2a3f69b77fae05268c3930650c2d0d5b092614cce853583c" +PKG_LICENSE="LGPLv2.1" +PKG_SITE="https://code.videolan.org/videolan/libudfread" +PKG_URL="https://code.videolan.org/videolan/$PKG_NAME/-/archive/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_DEPENDS_TARGET="toolchain" +PKG_LONGDESC="UDF reader" +PKG_TOOLCHAIN="autotools" + +PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared" From eaa12a271a28121a0944fc836b12ab49ea1f8a7c Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Sun, 5 Apr 2020 03:08:35 +0100 Subject: [PATCH 06/13] kodi: build external libudfread --- packages/mediacenter/kodi/package.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk index f78296fe43..2bd94a8104 100644 --- a/packages/mediacenter/kodi/package.mk +++ b/packages/mediacenter/kodi/package.mk @@ -5,7 +5,7 @@ PKG_NAME="kodi" PKG_LICENSE="GPL" PKG_SITE="http://www.kodi.tv" -PKG_DEPENDS_TARGET="toolchain JsonSchemaBuilder:host TexturePacker:host Python3 zlib systemd lzo pcre swig:host libass curl fontconfig fribidi tinyxml libjpeg-turbo freetype libcdio taglib libxml2 libxslt rapidjson sqlite ffmpeg crossguid giflib libdvdnav libhdhomerun libfmt lirc libfstrcmp flatbuffers:host flatbuffers" +PKG_DEPENDS_TARGET="toolchain JsonSchemaBuilder:host TexturePacker:host Python3 zlib systemd lzo pcre swig:host libass curl fontconfig fribidi tinyxml libjpeg-turbo freetype libcdio taglib libxml2 libxslt rapidjson sqlite ffmpeg crossguid giflib libdvdnav libhdhomerun libfmt lirc libfstrcmp flatbuffers:host flatbuffers libudfread" PKG_LONGDESC="A free and open source cross-platform media player." PKG_BUILD_FLAGS="+speed" @@ -217,6 +217,7 @@ configure_package() { -DFFMPEG_PATH=$SYSROOT_PREFIX/usr \ -DENABLE_INTERNAL_FFMPEG=OFF \ -DENABLE_INTERNAL_CROSSGUID=OFF \ + -DENABLE_INTERNAL_UDFREAD=OFF \ -DENABLE_UDEV=ON \ -DENABLE_DBUS=ON \ -DENABLE_XSLT=ON \ From 5901e0c406d811b42065047a27bb7619706b4ca3 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Fri, 10 Mar 2017 05:46:13 +0000 Subject: [PATCH 07/13] spdlog: add package --- packages/devel/spdlog/package.mk | 33 ++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 packages/devel/spdlog/package.mk diff --git a/packages/devel/spdlog/package.mk b/packages/devel/spdlog/package.mk new file mode 100644 index 0000000000..9754325acf --- /dev/null +++ b/packages/devel/spdlog/package.mk @@ -0,0 +1,33 @@ +################################################################################ +# This file is part of LibreELEC - http://www.libreelec.tv +# Copyright (C) 2017 Team LibreELEC +# +# LibreELEC is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# LibreELEC is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with LibreELEC. If not, see . +################################################################################ + +PKG_NAME="spdlog" +PKG_VERSION="0.11.0" +PKG_ARCH="any" +PKG_LICENSE="MIT" +PKG_SITE="https://github.com/gabime/spdlog" +PKG_URL="https://github.com/gabime/spdlog/archive/v$PKG_VERSION.tar.gz" +PKG_DEPENDS_TARGET="toolchain" +PKG_SECTION="devel" +PKG_SHORTDESC="spdlog: Very fast, header only, C++ logging library." +PKG_LONGDESC="Very fast, header only, C++ logging library." + +PKG_IS_ADDON="no" +PKG_AUTORECONF="no" + +PKG_CMAKE_OPTS_TARGET="-DSPDLOG_BUILD_EXAMPLES=OFF -DSPDLOG_BUILD_TESTS=OFF" From 505b6c3e749b32e70e844f5b5ab3f3c660050d31 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Thu, 9 Apr 2020 22:07:56 +0100 Subject: [PATCH 08/13] spdlog: update to spdlog-1.5.0 --- packages/devel/spdlog/package.mk | 33 +++++++------------------------- 1 file changed, 7 insertions(+), 26 deletions(-) diff --git a/packages/devel/spdlog/package.mk b/packages/devel/spdlog/package.mk index 9754325acf..2876430a0b 100644 --- a/packages/devel/spdlog/package.mk +++ b/packages/devel/spdlog/package.mk @@ -1,33 +1,14 @@ -################################################################################ -# This file is part of LibreELEC - http://www.libreelec.tv -# Copyright (C) 2017 Team LibreELEC -# -# LibreELEC is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 2 of the License, or -# (at your option) any later version. -# -# LibreELEC is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with LibreELEC. If not, see . -################################################################################ +# SPDX-License-Identifier: GPL-2.0 +# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="spdlog" -PKG_VERSION="0.11.0" -PKG_ARCH="any" +PKG_VERSION="1.5.0" +PKG_SHA256="b38e0bbef7faac2b82fed550a0c19b0d4e7f6737d5321d4fd8f216b80f8aee8a" PKG_LICENSE="MIT" PKG_SITE="https://github.com/gabime/spdlog" PKG_URL="https://github.com/gabime/spdlog/archive/v$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain" -PKG_SECTION="devel" -PKG_SHORTDESC="spdlog: Very fast, header only, C++ logging library." +PKG_DEPENDS_TARGET="toolchain libfmt" PKG_LONGDESC="Very fast, header only, C++ logging library." +PKG_TOOLCHAIN="cmake" -PKG_IS_ADDON="no" -PKG_AUTORECONF="no" - -PKG_CMAKE_OPTS_TARGET="-DSPDLOG_BUILD_EXAMPLES=OFF -DSPDLOG_BUILD_TESTS=OFF" +PKG_CMAKE_OPTS_TARGET="-DCMAKE_CXX_STANDARD=14 -DCMAKE_CXX_EXTENSIONS:BOOL=OFF -DSPDLOG_FMT_EXTERNAL=ON -DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_BUILD_TESTS=OFF" From d6451da05bdeb707892e9faf0dd7f96e024c85cb Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Thu, 9 Apr 2020 22:09:58 +0100 Subject: [PATCH 09/13] libfmt: update to libfmt-7d01859 (6.2.0 with bug fix) --- packages/devel/libfmt/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/devel/libfmt/package.mk b/packages/devel/libfmt/package.mk index 569570b9d6..4a5235c659 100644 --- a/packages/devel/libfmt/package.mk +++ b/packages/devel/libfmt/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libfmt" -PKG_VERSION="6.1.2" -PKG_SHA256="1cafc80701b746085dddf41bd9193e6d35089e1c6ec1940e037fcb9c98f62365" +PKG_VERSION="7d01859ef16e6b65bc023ad8bebfedecb088bf81" +PKG_SHA256="ecc44fb4c4ca42ec0af260e849642cc1f89cb9169659aa53bbcaad7ad4acbc16" PKG_LICENSE="BSD" PKG_SITE="https://github.com/fmtlib/fmt" PKG_URL="https://github.com/fmtlib/fmt/archive/$PKG_VERSION.tar.gz" From ff660c5d99b6892e891f454b0577b8a995ca4b41 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Thu, 16 Apr 2020 23:06:28 +0100 Subject: [PATCH 10/13] kodi: build external spdlog --- packages/mediacenter/kodi/package.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk index 2bd94a8104..646578efd8 100644 --- a/packages/mediacenter/kodi/package.mk +++ b/packages/mediacenter/kodi/package.mk @@ -5,7 +5,7 @@ PKG_NAME="kodi" PKG_LICENSE="GPL" PKG_SITE="http://www.kodi.tv" -PKG_DEPENDS_TARGET="toolchain JsonSchemaBuilder:host TexturePacker:host Python3 zlib systemd lzo pcre swig:host libass curl fontconfig fribidi tinyxml libjpeg-turbo freetype libcdio taglib libxml2 libxslt rapidjson sqlite ffmpeg crossguid giflib libdvdnav libhdhomerun libfmt lirc libfstrcmp flatbuffers:host flatbuffers libudfread" +PKG_DEPENDS_TARGET="toolchain JsonSchemaBuilder:host TexturePacker:host Python3 zlib systemd lzo pcre swig:host libass curl fontconfig fribidi tinyxml libjpeg-turbo freetype libcdio taglib libxml2 libxslt rapidjson sqlite ffmpeg crossguid giflib libdvdnav libhdhomerun libfmt lirc libfstrcmp flatbuffers:host flatbuffers libudfread spdlog" PKG_LONGDESC="A free and open source cross-platform media player." PKG_BUILD_FLAGS="+speed" @@ -218,6 +218,7 @@ configure_package() { -DENABLE_INTERNAL_FFMPEG=OFF \ -DENABLE_INTERNAL_CROSSGUID=OFF \ -DENABLE_INTERNAL_UDFREAD=OFF \ + -DENABLE_INTERNAL_SPDLOG=OFF \ -DENABLE_UDEV=ON \ -DENABLE_DBUS=ON \ -DENABLE_XSLT=ON \ From 827722fa7058ae3e33250b8c90d3522e89240cdc Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Sat, 18 Apr 2020 20:27:59 +0100 Subject: [PATCH 11/13] kodi: disable testing --- packages/mediacenter/kodi/package.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk index 646578efd8..b494f28a4a 100644 --- a/packages/mediacenter/kodi/package.mk +++ b/packages/mediacenter/kodi/package.mk @@ -228,6 +228,7 @@ configure_package() { -DENABLE_LDGOLD=ON \ -DENABLE_DEBUGFISSION=OFF \ -DENABLE_APP_AUTONAME=OFF \ + -DENABLE_TESTING=OFF \ -DENABLE_INTERNAL_FLATBUFFERS=OFF \ $PKG_KODI_USE_LTO \ $KODI_ARCH \ From 0cc42e760945f3b5f3c47159ad51d4be27285aaa Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Sat, 18 Apr 2020 21:26:50 +0100 Subject: [PATCH 12/13] LibreELEC-settings: update to LibreELEC-settings-7b5ef62 --- packages/mediacenter/LibreELEC-settings/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/mediacenter/LibreELEC-settings/package.mk b/packages/mediacenter/LibreELEC-settings/package.mk index ee09c35bb8..fc5929b782 100644 --- a/packages/mediacenter/LibreELEC-settings/package.mk +++ b/packages/mediacenter/LibreELEC-settings/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="LibreELEC-settings" -PKG_VERSION="98b9f77e9a6562e1ea429097cebf2ccaac2ee6a9" -PKG_SHA256="8bc617577ed38721ebbb7134fe828ab78fc2c9593caa8ce8ab294b662810c7b3" +PKG_VERSION="7b5ef62bd17a2357fbdd43aa543194ab4f4beee5" +PKG_SHA256="24b7879e67edc4d6ba41d0d243414a176770753293f2da9d5d659678572d47d1" PKG_LICENSE="GPL" PKG_SITE="https://libreelec.tv" PKG_URL="https://github.com/LibreELEC/service.libreelec.settings/archive/$PKG_VERSION.tar.gz" From b4a7cb2e8b2d3bb51ba84e29269102e8be5d7bbb Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Sun, 19 Apr 2020 17:23:58 +0100 Subject: [PATCH 13/13] kodi (Amlogic/Allwinner): drop guisize patch --- .../Allwinner/patches/kodi/0002-guisize.patch | 150 ------------------ .../Amlogic/patches/kodi/kodi-guisize.patch | 150 ------------------ 2 files changed, 300 deletions(-) delete mode 100644 projects/Allwinner/patches/kodi/0002-guisize.patch delete mode 100644 projects/Amlogic/patches/kodi/kodi-guisize.patch diff --git a/projects/Allwinner/patches/kodi/0002-guisize.patch b/projects/Allwinner/patches/kodi/0002-guisize.patch deleted file mode 100644 index 192422b947..0000000000 --- a/projects/Allwinner/patches/kodi/0002-guisize.patch +++ /dev/null @@ -1,150 +0,0 @@ -From a1818990f68fe77d02a63c07c29e7832e2b9da27 Mon Sep 17 00:00:00 2001 -From: Jonas Karlman -Date: Wed, 16 Oct 2019 19:38:11 +0000 -Subject: [PATCH] windowing/gbm: add option to limit gui size - ---- - .../resources/strings.po | 44 ++++++++++++++++++- - system/settings/gbm.xml | 15 +++++++ - xbmc/windowing/gbm/DRMUtils.cpp | 32 ++++++++++++++ - 3 files changed, 90 insertions(+), 1 deletion(-) - -diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po -index c573f6e5f9c9..a520acda5ca7 100644 ---- a/addons/resource.language.en_gb/resources/strings.po -+++ b/addons/resource.language.en_gb/resources/strings.po -@@ -7234,7 +7234,49 @@ msgctxt "#13465" - msgid "EGL" - msgstr "" - --#empty strings from id 13466 to 13504 -+#. Option for setting Limit GUI Size -+#: system/settings/gbm.xml -+msgctxt "#13466" -+msgid "Limit GUI Size" -+msgstr "" -+ -+#. Description of setting with label #13466 "Limit GUI Size" -+#: system/settings/gbm.xml -+msgctxt "#13467" -+msgid "This option limits GUI size for screen resolutions above 1080p. Requires restart." -+msgstr "" -+ -+#. String for options 1 of setting with label #13466 "Limit GUI Size" -+#: system/settings/gbm.xml -+msgctxt "#13468" -+msgid "No limit" -+msgstr "" -+ -+#. String for options 2 of setting with label #13466 "Limit GUI Size" -+#: system/settings/gbm.xml -+msgctxt "#13469" -+msgid "720p" -+msgstr "" -+ -+#. String for options 3 of setting with label #13466 "Limit GUI Size" -+#: system/settings/gbm.xml -+msgctxt "#13470" -+msgid "1080p / 720p (>30hz)" -+msgstr "" -+ -+#. String for options 4 of setting with label #13466 "Limit GUI Size" -+#: system/settings/gbm.xml -+msgctxt "#13471" -+msgid "1080p" -+msgstr "" -+ -+#. String for options 5 of setting with label #13466 "Limit GUI Size" -+#: system/settings/gbm.xml -+msgctxt "#13472" -+msgid "No limit / 1080p (>30hz)" -+msgstr "" -+ -+#empty strings from id 13473 to 13504 - - #: system/settings/settings.xml - msgctxt "#13505" -diff --git a/system/settings/gbm.xml b/system/settings/gbm.xml -index 939ca12ba287..9bd1d04dfb7a 100644 ---- a/system/settings/gbm.xml -+++ b/system/settings/gbm.xml -@@ -36,6 +36,21 @@ - - false - -+ -+ false -+ 3 -+ 0 -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - 3 - false -diff --git a/xbmc/windowing/gbm/DRMUtils.cpp b/xbmc/windowing/gbm/DRMUtils.cpp -index bbbc447498cf..3980ef7058e9 100644 ---- a/xbmc/windowing/gbm/DRMUtils.cpp -+++ b/xbmc/windowing/gbm/DRMUtils.cpp -@@ -8,6 +8,8 @@ - - #include "DRMUtils.h" - -+#include "settings/Settings.h" -+#include "settings/SettingsComponent.h" - #include "utils/StringUtils.h" - #include "utils/log.h" - #include "windowing/GraphicContext.h" -@@ -27,6 +29,11 @@ - - using namespace KODI::WINDOWING::GBM; - -+namespace -+{ -+const std::string SETTING_VIDEOSCREEN_LIMITGUISIZE = "videoscreen.limitguisize"; -+} -+ - CDRMUtils::CDRMUtils() - : m_connector(new connector) - , m_encoder(new encoder) -@@ -763,6 +770,31 @@ RESOLUTION_INFO CDRMUtils::GetResolutionInfo(drmModeModeInfoPtr mode) - res.iWidth = res.iScreenWidth; - res.iHeight = res.iScreenHeight; - -+ int limit = CServiceBroker::GetSettingsComponent()->GetSettings()->GetInt( -+ SETTING_VIDEOSCREEN_LIMITGUISIZE); -+ if (limit > 0 && res.iScreenWidth > 1920 && res.iScreenHeight > 1080) -+ { -+ switch (limit) -+ { -+ case 1: // 720p -+ res.iWidth = 1280; -+ res.iHeight = 720; -+ break; -+ case 2: // 1080p / 720p (>30hz) -+ res.iWidth = mode->vrefresh > 30 ? 1280 : 1920; -+ res.iHeight = mode->vrefresh > 30 ? 720 : 1080; -+ break; -+ case 3: // 1080p -+ res.iWidth = 1920; -+ res.iHeight = 1080; -+ break; -+ case 4: // No limit / 1080p (>30hz) -+ res.iWidth = mode->vrefresh > 30 ? 1920 : res.iScreenWidth; -+ res.iHeight = mode->vrefresh > 30 ? 1080 : res.iScreenHeight; -+ break; -+ } -+ } -+ - if (mode->clock % 5 != 0) - res.fRefreshRate = static_cast(mode->vrefresh) * (1000.0f/1001.0f); - else - diff --git a/projects/Amlogic/patches/kodi/kodi-guisize.patch b/projects/Amlogic/patches/kodi/kodi-guisize.patch deleted file mode 100644 index 192422b947..0000000000 --- a/projects/Amlogic/patches/kodi/kodi-guisize.patch +++ /dev/null @@ -1,150 +0,0 @@ -From a1818990f68fe77d02a63c07c29e7832e2b9da27 Mon Sep 17 00:00:00 2001 -From: Jonas Karlman -Date: Wed, 16 Oct 2019 19:38:11 +0000 -Subject: [PATCH] windowing/gbm: add option to limit gui size - ---- - .../resources/strings.po | 44 ++++++++++++++++++- - system/settings/gbm.xml | 15 +++++++ - xbmc/windowing/gbm/DRMUtils.cpp | 32 ++++++++++++++ - 3 files changed, 90 insertions(+), 1 deletion(-) - -diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po -index c573f6e5f9c9..a520acda5ca7 100644 ---- a/addons/resource.language.en_gb/resources/strings.po -+++ b/addons/resource.language.en_gb/resources/strings.po -@@ -7234,7 +7234,49 @@ msgctxt "#13465" - msgid "EGL" - msgstr "" - --#empty strings from id 13466 to 13504 -+#. Option for setting Limit GUI Size -+#: system/settings/gbm.xml -+msgctxt "#13466" -+msgid "Limit GUI Size" -+msgstr "" -+ -+#. Description of setting with label #13466 "Limit GUI Size" -+#: system/settings/gbm.xml -+msgctxt "#13467" -+msgid "This option limits GUI size for screen resolutions above 1080p. Requires restart." -+msgstr "" -+ -+#. String for options 1 of setting with label #13466 "Limit GUI Size" -+#: system/settings/gbm.xml -+msgctxt "#13468" -+msgid "No limit" -+msgstr "" -+ -+#. String for options 2 of setting with label #13466 "Limit GUI Size" -+#: system/settings/gbm.xml -+msgctxt "#13469" -+msgid "720p" -+msgstr "" -+ -+#. String for options 3 of setting with label #13466 "Limit GUI Size" -+#: system/settings/gbm.xml -+msgctxt "#13470" -+msgid "1080p / 720p (>30hz)" -+msgstr "" -+ -+#. String for options 4 of setting with label #13466 "Limit GUI Size" -+#: system/settings/gbm.xml -+msgctxt "#13471" -+msgid "1080p" -+msgstr "" -+ -+#. String for options 5 of setting with label #13466 "Limit GUI Size" -+#: system/settings/gbm.xml -+msgctxt "#13472" -+msgid "No limit / 1080p (>30hz)" -+msgstr "" -+ -+#empty strings from id 13473 to 13504 - - #: system/settings/settings.xml - msgctxt "#13505" -diff --git a/system/settings/gbm.xml b/system/settings/gbm.xml -index 939ca12ba287..9bd1d04dfb7a 100644 ---- a/system/settings/gbm.xml -+++ b/system/settings/gbm.xml -@@ -36,6 +36,21 @@ - - false - -+ -+ false -+ 3 -+ 0 -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - 3 - false -diff --git a/xbmc/windowing/gbm/DRMUtils.cpp b/xbmc/windowing/gbm/DRMUtils.cpp -index bbbc447498cf..3980ef7058e9 100644 ---- a/xbmc/windowing/gbm/DRMUtils.cpp -+++ b/xbmc/windowing/gbm/DRMUtils.cpp -@@ -8,6 +8,8 @@ - - #include "DRMUtils.h" - -+#include "settings/Settings.h" -+#include "settings/SettingsComponent.h" - #include "utils/StringUtils.h" - #include "utils/log.h" - #include "windowing/GraphicContext.h" -@@ -27,6 +29,11 @@ - - using namespace KODI::WINDOWING::GBM; - -+namespace -+{ -+const std::string SETTING_VIDEOSCREEN_LIMITGUISIZE = "videoscreen.limitguisize"; -+} -+ - CDRMUtils::CDRMUtils() - : m_connector(new connector) - , m_encoder(new encoder) -@@ -763,6 +770,31 @@ RESOLUTION_INFO CDRMUtils::GetResolutionInfo(drmModeModeInfoPtr mode) - res.iWidth = res.iScreenWidth; - res.iHeight = res.iScreenHeight; - -+ int limit = CServiceBroker::GetSettingsComponent()->GetSettings()->GetInt( -+ SETTING_VIDEOSCREEN_LIMITGUISIZE); -+ if (limit > 0 && res.iScreenWidth > 1920 && res.iScreenHeight > 1080) -+ { -+ switch (limit) -+ { -+ case 1: // 720p -+ res.iWidth = 1280; -+ res.iHeight = 720; -+ break; -+ case 2: // 1080p / 720p (>30hz) -+ res.iWidth = mode->vrefresh > 30 ? 1280 : 1920; -+ res.iHeight = mode->vrefresh > 30 ? 720 : 1080; -+ break; -+ case 3: // 1080p -+ res.iWidth = 1920; -+ res.iHeight = 1080; -+ break; -+ case 4: // No limit / 1080p (>30hz) -+ res.iWidth = mode->vrefresh > 30 ? 1920 : res.iScreenWidth; -+ res.iHeight = mode->vrefresh > 30 ? 1080 : res.iScreenHeight; -+ break; -+ } -+ } -+ - if (mode->clock % 5 != 0) - res.fRefreshRate = static_cast(mode->vrefresh) * (1000.0f/1001.0f); - else -