Bug 278334 - multimedia/kodi: Update to 21.0
Summary: multimedia/kodi: Update to 21.0
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Bernhard Froehlich
URL: https://kodi.tv/article/kodi-21-0-ome...
Keywords:
Depends on: 278238
Blocks:
  Show dependency treegraph
 
Reported: 2024-04-12 17:43 UTC by yzrh
Modified: 2024-05-26 05:46 UTC (History)
5 users (show)

See Also:


Attachments
Kodi 21.0 (126.14 KB, patch)
2024-04-12 17:43 UTC, yzrh
no flags Details | Diff
testport log (bzip2) (122.05 KB, application/x-bzip)
2024-04-12 17:43 UTC, yzrh
no flags Details
game.libretro 21.0.6 (1.91 KB, patch)
2024-04-27 15:20 UTC, yzrh
no flags Details | Diff
game.libretro 21.0.6 (add one more dependency) (2.38 KB, patch)
2024-04-28 14:13 UTC, yzrh
no flags Details | Diff
testport log (96.91 KB, text/plain)
2024-04-28 14:18 UTC, yzrh
no flags Details

Note You need to log in before you can comment on or make changes to this bug.
Description yzrh 2024-04-12 17:43:14 UTC
Created attachment 249935 [details]
Kodi 21.0
Comment 1 yzrh 2024-04-12 17:43:45 UTC
Created attachment 249936 [details]
testport log (bzip2)
Comment 2 Nuno Teixeira freebsd_committer freebsd_triage 2024-04-12 19:25:37 UTC
Hello,

Using MASTER_SITES and USE_GITHUB=yes needs adjusting.
https://docs.freebsd.org/en/books/porters-handbook/book/#makefile-master_sites-github-multiple

---
When fetching multiple files from GitHub, sometimes the default distribution file is not fetched from GitHub. To disable fetching the default distribution, set:

USE_GITHUB=	nodefault
---

Could you take a look at it?

Cheers
Comment 3 yzrh 2024-04-14 18:40:28 UTC
In the case of Kodi, upstream removed binaries from
source, hence the use of MASTER_SITES.  The source itself
still comes from GitHub, which is the `default distribution file'?
It seems to build correctly.
Comment 4 Bernhard Froehlich freebsd_committer freebsd_triage 2024-04-14 19:25:57 UTC
I'll take it
Comment 5 Bernhard Froehlich freebsd_committer freebsd_triage 2024-04-27 08:31:29 UTC
I am currently updating all the kodi addons and except the kodi libretro addon they were all easy to update/fix.

Buildlog is at:
https://ports.bluelife.at/builds/20240426-19:03:08.36331/

Code is available there:
https://codeberg.org/decke/ports
Comment 6 yzrh 2024-04-27 13:35:47 UTC
Looks like a new dependency.  Let me take a closer look at
this https://github.com/libretro/libretro-common.
Comment 7 yzrh 2024-04-27 15:20:55 UTC
Created attachment 250261 [details]
game.libretro 21.0.6

Download the tarball and add CMAKE_ARGS -DLIBRETROCOMMON_URL should
be enough to fix it.  Test building now.
Comment 8 yzrh 2024-04-28 14:13:56 UTC
Created attachment 250281 [details]
game.libretro 21.0.6 (add one more dependency)

There is one more dependency: rcheevos.
Comment 9 yzrh 2024-04-28 14:18:49 UTC
Created attachment 250282 [details]
testport log

It failed to build (for me anyway).  Looks like upstream's depends/common/rcheevos/CMakeLists.txt
does not actually install the project, despite showing up in build log.
Comment 10 Bernhard Froehlich freebsd_committer freebsd_triage 2024-05-09 12:16:26 UTC
I can reproduce it and the problem seems to be the install location.

[ 28% 15/52] cd /usr/home/decke/dev/ports/games/kodi-addon-game.libretro/work/.build/build/rcheevos/src/rcheevos-build && /usr/local/bin/cmake --build . --target install && /usr/local/bin/cmake -E touch /usr/home/decke/dev/ports/games/kodi-addon-game.libretro/work/.build/build/rcheevos/src/rcheevos-stamp/rcheevos-install
[  0% 1/1] Install the project...
-- Install configuration: ""
-- Installing: /usr/home/decke/dev/ports/games/kodi-addon-game.libretro/work/stage/usr/home/decke/dev/ports/games/kodi-addon-game.libretro/work/.build/build/depends/lib/librcheevoslib.a
-- Installing: /usr/home/decke/dev/ports/games/kodi-addon-game.libretro/work/stage/usr/home/decke/dev/ports/games/kodi-addon-game.libretro/work/.build/build/depends/include/rcheevos/rcheevos.h
-- Installing: /usr/home/decke/dev/ports/games/kodi-addon-game.libretro/work/stage/usr/home/decke/dev/ports/games/kodi-addon-game.libretro/work/.build/build/depends/include/rcheevos/rconsoles.h
-- Installing: /usr/home/decke/dev/ports/games/kodi-addon-game.libretro/work/stage/usr/home/decke/dev/ports/games/kodi-addon-game.libretro/work/.build/build/depends/include/rcheevos/rhash.h
-- Installing: /usr/home/decke/dev/ports/games/kodi-addon-game.libretro/work/stage/usr/home/decke/dev/ports/games/kodi-addon-game.libretro/work/.build/build/depends/include/rcheevos/rurl.h
[ 30% 16/52] cd /usr/home/decke/dev/ports/games/kodi-addon-game.libretro/work/.build && /usr/local/bin/cmake -E make_directory /usr/home/decke/dev/ports/games/kodi-addon-game.libretro/work/.build/CMakeFiles && /usr/local/bin/cmake -E touch /usr/home/decke/dev/ports/games/kodi-addon-game.libretro/work/.build/CMakeFiles/rcheevos-complete && /usr/local/bin/cmake -E touch /usr/home/decke/dev/ports/games/kodi-addon-game.libretro/work/.build/build/rcheevos/src/rcheevos-stamp/rcheevos-done

There you can see the install location is

/usr/home/decke/dev/ports/games/kodi-addon-game.libretro/work/stage/usr/home/decke/dev/ports/games/kodi-addon-game.libretro/work/.build/build/depends/include/rcheevos/

but actually should be

/usr/home/decke/dev/ports/games/kodi-addon-game.libretro/work/.build/build/depends/include

to match RCHEEVOS_INCLUDE_DIR.


Since I could not find any specific destination in build/rcheevos/src/rcheevos/CMakeLists.txt my guess is that the ports framework sets some cmake variable which is picked up incorrectly but I haven't found it yet.
Comment 11 Bernhard Froehlich freebsd_committer freebsd_triage 2024-05-09 12:36:50 UTC
I've CC'd game.libretro maintainer. Probably he also has some time to have a look.
Comment 12 Bernhard Froehlich freebsd_committer freebsd_triage 2024-05-09 20:52:32 UTC
I found a workaround for this problem. Builds fine locally now, poudriere builds are running.
Comment 13 Ivan Rozhuk 2024-05-09 22:36:54 UTC
kodi game.* ports only set of xml/icons, all binaries installed as dep ports.
Comment 14 commit-hook freebsd_committer freebsd_triage 2024-05-26 05:34:37 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=edac4920e0a19b7c6979fb2b4a891418d2fbd871

commit edac4920e0a19b7c6979fb2b4a891418d2fbd871
Author:     yzrh <yzrh@noema.org>
AuthorDate: 2024-05-25 19:24:48 +0000
Commit:     Bernhard Froehlich <decke@FreeBSD.org>
CommitDate: 2024-05-26 05:32:32 +0000

    multimedia/kodi: Update to 21.0

    PR:             278334

 multimedia/kodi/Makefile                           |   71 +-
 multimedia/kodi/distinfo                           |   24 +-
 .../files/patch-cmake_modules_FindCrossGUID.cmake  |   37 +-
 .../patch-cmake_modules_FindLibDvdCSS.cmake (gone) |   11 -
 .../patch-cmake_modules_FindLibDvdNav.cmake (gone) |   11 -
 ...patch-cmake_modules_FindLibDvdRead.cmake (gone) |   11 -
 multimedia/kodi/files/patch-ffmpeg6-support (gone) | 2155 --------------------
 ...tch-xbmc_cores_AudioEngine_Sinks_AESinkALSA.cpp |    4 +-
 ..._cores_AudioEngine_Utils_AEELDParser.cpp (gone) |   11 -
 multimedia/kodi/pkg-plist                          |  275 +--
 10 files changed, 156 insertions(+), 2454 deletions(-)
Comment 15 Bernhard Froehlich freebsd_committer freebsd_triage 2024-05-26 05:46:44 UTC
Kodi 21.0 has landed! Thanks everyone!

I decided to only bump PORTREVISION for the libretro addons because they seem to work. Since I have prepared updates for some addons I will create  a separate PR for that.