Re: [Buildroot] [PATCH v2 07/20] package/kodi: bump version to 21.0-Omega

[Thomas Petazzoni via buildroot <buildroot@buildroot.org>]

On Sun,  7 Apr 2024 13:44:32 +0200
Bernd Kuhls <bernd@kuhls.net> wrote:

> Added new dependency to libdisplay-info for gbm support:
> https://github.com/xbmc/xbmc/commit/ce9626479c1792210c7b7cc02c7dc4f819ace509
> 
> Added new required dependency to tinyxml2:
> https://github.com/xbmc/xbmc/commit/9e983ed0449aaf3007d8bfa3261056b120d84188
> Please note that parts of kodi still use tinyxml so both dependencies
> are needed.
> 
> Added new required dependency to libudfread: Since upstream commit
> https://github.com/xbmc/xbmc/commit/5f9b9cfa26f274e381e92d73cfa33fb55582436e
> kodi does not build anymore without libudfread.
> 
> Upstream removed the bundled groovy/apache commons binaries:
> https://github.com/xbmc/xbmc/commit/d6bc920e056baad7782f47b86cba85d1336bb134
> 
> - JsonSchemaBuilder fixes:
> 
> Upstream moved CMakeLists.txt to src/ subfolder:
> https://github.com/xbmc/xbmc/commit/7e87d98ca55c72fcbc9b8dadf2cb979a85732606
> 
> - TexturePacker fixes:
> 
> texturepacker now depends on c++17:
> https://github.com/xbmc/xbmc/commit/54bd6d7ab552a4ddc04d2595826457d8bfa864d5
> 
> Since the host version of texturepacker is a build dependency of kodi:
> https://github.com/xbmc/xbmc/blob/Omega/CMakeLists.txt#L187
> https://github.com/xbmc/xbmc/blob/Omega/CMakeLists.txt#L472
> we add a new dependency to BR2_HOST_GCC_AT_LEAST_9.
> 
> Upstream moved CMakeLists.txt to src/ subfolder
> https://github.com/xbmc/xbmc/commit/e336a75f42d9c4efd3433f3fa6edd05309689deb
> 
> Due to this update we can remove all of our patches for texturepacker.
> 
> - Kodi fixes:
> 
> Set KODI_SOURCE_DIR variable to root directory of the source tarball.
> When building natively, outside of a meta buildsystem like Buildroot,
> kodi builds its own tools as part of its build process. TexturePacker
> needs cmake modules available from the top of the Kodi source tree, a
> source file in a sub-directory at the top-level source tree, which
> itself needs includes from the same sub-dir. The Kodi build process sets
> KODI_SOURCE_DIR so that TexturePacker can find those files.
> 
> In Buildroot, as we cross-build, we build the tools explicitly, without
> using the Kodi build process, and thus we must set KODI_SOURCE_DIR to the
> root directory of the source tarball. LibreELEC added something similar:
> https://github.com/LibreELEC/LibreELEC.tv/commit/70abdd27a22b22547060fcb00a2c70ea61721465
> 
> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
> ---
>  .../kodi-jsonschemabuilder.mk                 |  6 ++---
>  .../0001-texturepacker.patch                  | 16 -----------
>  ...-fix-texture-packer-cmake-source-dir.patch | 27 -------------------
>  .../kodi-texturepacker/kodi-texturepacker.mk  |  9 ++++---
>  package/kodi/Config.in                        |  4 +++
>  package/kodi/kodi.hash                        |  6 ++++-
>  package/kodi/kodi.mk                          | 25 ++++++++++-------
>  7 files changed, 33 insertions(+), 60 deletions(-)
>  delete mode 100644 package/kodi-texturepacker/0001-texturepacker.patch
>  delete mode 100644 package/kodi-texturepacker/0002-fix-texture-packer-cmake-source-dir.patch

Thanks for the detailed commit log explaining all the changes, it was
*very* useful.

One small thing was missing: you add a dependency on host gcc >= 9, but
you forgot to update the Config.in comment and dependency about this. I
fixed that up when applying.

Thanks for the continued maintenance of this complicated package!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot