Bug 290895 - multimedia/kodi: Update to 21.3
Summary: multimedia/kodi: Update to 21.3
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Some People
Assignee: Vladimir Druzenko
URL: https://github.com/xbmc/xbmc/releases...
Keywords:
Depends on:
Blocks:
 
Reported: 2025-11-08 13:43 UTC by yzrh
Modified: 2025-11-16 15:18 UTC (History)
2 users (show)

See Also:


Attachments
Kodi 21.3 (11.94 KB, patch)
2025-11-08 13:43 UTC, yzrh
no flags Details | Diff
testport log (bzip2) (129.92 KB, application/x-bzip)
2025-11-08 13:47 UTC, yzrh
no flags Details
kodi 21.3 (use https in MASTER_SITES) (12.40 KB, patch)
2025-11-09 10:40 UTC, yzrh
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description yzrh 2025-11-08 13:43:48 UTC
Created attachment 265268 [details]
Kodi 21.3

Also removing a workaround for 286311.
Comment 1 yzrh 2025-11-08 13:47:02 UTC
Created attachment 265269 [details]
testport log (bzip2)
Comment 2 Vladimir Druzenko freebsd_committer freebsd_triage 2025-11-08 14:34:27 UTC
Suggestion:
-MASTER_SITES=	http://mirrors.kodi.tv/build-deps/sources/
+MASTER_SITES=	https://mirrors.kodi.tv/build-deps/sources/
Comment 3 Vladimir Druzenko freebsd_committer freebsd_triage 2025-11-08 15:07:22 UTC
I see comment in Makefile:
# do not forget to fix devel/kodi-platform when updating kodi

devel/kodi-platform PORTVERSION=20190726, but there is newer version: https://github.com/xbmc/kodi-platform/tags
Maybe update it too?
Comment 4 Vladimir Druzenko freebsd_committer freebsd_triage 2025-11-08 18:47:08 UTC
diff --git a/devel/kodi-platform/Makefile b/devel/kodi-platform/Makefile
index e3ffa5dcbc2a..209bab7b75c0 100644
--- a/devel/kodi-platform/Makefile
+++ b/devel/kodi-platform/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=      kodi-platform
-PORTVERSION=   20190726
-PORTREVISION=  11
+DISTVERSIONPREFIX=     kodiplatform-
+DISTVERSION=   20250416
 CATEGORIES=    devel
 
 MAINTAINER=    decke@FreeBSD.org
@@ -17,7 +17,6 @@ USES=         cmake compiler:c++11-lang
 
 USE_GITHUB=    yes
 GH_ACCOUNT=    xbmc
-GH_TAGNAME=    809c5e9
 
 USE_LDCONFIG=  yes
 
diff --git a/devel/kodi-platform/distinfo b/devel/kodi-platform/distinfo
index 10cd8760bb5c..869b4aac5d19 100644
--- a/devel/kodi-platform/distinfo
+++ b/devel/kodi-platform/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1609013238
-SHA256 (xbmc-kodi-platform-20190726-809c5e9_GH0.tar.gz) = 7e4e192e0a379ca33283472dffa6e5df3b49ba74b42113aa7f71f65c607698a8
-SIZE (xbmc-kodi-platform-20190726-809c5e9_GH0.tar.gz) = 8613
+TIMESTAMP = 1762622222
+SHA256 (xbmc-kodi-platform-kodiplatform-20250416_GH0.tar.gz) = e559715b37b91e219ea2bb72cff0d0b29cf08386685fd12328520a294bb17b57
+SIZE (xbmc-kodi-platform-kodiplatform-20250416_GH0.tar.gz) = 8633
diff --git a/devel/kodi-platform/pkg-plist b/devel/kodi-platform/pkg-plist
index f0e2a8f30703..2495130e526d 100644
--- a/devel/kodi-platform/pkg-plist
+++ b/devel/kodi-platform/pkg-plist
@@ -1,6 +1,6 @@
 include/kodi/util/XMLUtils.h
 lib/kodiplatform/kodiplatform-config.cmake
 lib/libkodiplatform.so
-lib/libkodiplatform.so.21.0
-lib/libkodiplatform.so.21.2.0
+lib/libkodiplatform.so.21
+lib/libkodiplatform.so.21.3.0
 libdata/pkgconfig/kodiplatform.pc
Comment 5 yzrh 2025-11-09 10:40:57 UTC
Created attachment 265285 [details]
kodi 21.3 (use https in MASTER_SITES)
Comment 6 yzrh 2025-11-09 10:50:11 UTC
(In reply to Vladimir Druzenko from comment #3)

The fix is about bumping PORTREVISION and updating pkg-plist,
which has been included in patch.

Need to have decke to approve changes to kodi-platform itself.
Comment 7 Vladimir Druzenko freebsd_committer freebsd_triage 2025-11-09 22:43:05 UTC
(In reply to yzrh from comment #6)
I would rather commit both updates at once, but if we have to wait 2 weeks for the maintainer timeout, then it is better to separate these updates.
Comment 8 Vladimir Druzenko freebsd_committer freebsd_triage 2025-11-12 15:58:26 UTC
libexpat.so:textproc/expat2 and GL=glu not used.
Comment 9 Vladimir Druzenko freebsd_committer freebsd_triage 2025-11-12 17:01:45 UTC
USES=gettext not used too.
Comment 10 yzrh 2025-11-13 10:05:28 UTC
Both expat and gettext are referenced in source at tools/depends/native.
GLU is referenced at cmake/modules.

Dependencies were last tested when we updated to 21.0.  Linters sometimes do not
get it right.
Comment 11 Vladimir Druzenko freebsd_committer freebsd_triage 2025-11-13 13:00:12 UTC
(In reply to yzrh from comment #10)
> Both expat and gettext are referenced in source at tools/depends/native.
gettext-runtime (libintl)? or gettext-tools (msgfmt and etc.) too?
Comment 12 yzrh 2025-11-15 10:58:51 UTC
(In reply to Vladimir Druzenko from comment #11)

Both gettext-runtime and gettext-tools.  Kodi does have po files.
Comment 13 Vladimir Druzenko freebsd_committer freebsd_triage 2025-11-15 18:23:21 UTC
Forgot to ask about java versions: 8 and 11 supported only?
Build fine with 17 and 21.
Comment 14 commit-hook freebsd_committer freebsd_triage 2025-11-15 18:38:10 UTC
A commit in branch main references this bug:

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

commit 640aa7b8336b31014ccc41d8cb8ffed6b49a560f
Author:     yzrh <yzrh@noema.org>
AuthorDate: 2025-11-15 18:34:21 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2025-11-15 18:37:10 +0000

    devel/kodi-platform: Bump after update multimedia/kodi

    While here replace PORTVERSION with DISTVERSION.

    PR:             290895
    Approved by:    decke (maintainer, implicit)

 devel/kodi-platform/Makefile  | 4 ++--
 devel/kodi-platform/pkg-plist | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
Comment 15 commit-hook freebsd_committer freebsd_triage 2025-11-15 18:38:11 UTC
A commit in branch main references this bug:

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

commit 6721490fe4c6c186e4bf0a6a902c922b16d1265c
Author:     yzrh <yzrh@noema.org>
AuthorDate: 2025-11-15 18:32:34 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2025-11-15 18:37:09 +0000

    multimedia/kodi: Update 21.2 => 21.3

    Changelog:
    https://github.com/xbmc/xbmc/releases/tag/21.3-Omega

    PR:     290895

 multimedia/kodi/Makefile                                 |  9 ++-------
 multimedia/kodi/distinfo                                 | 10 +++-------
 .../patch-xbmc_windowing_gbm_drm_DRMAtomic.cpp (gone)    | 10 ----------
 multimedia/kodi/pkg-plist                                | 16 ++--------------
 4 files changed, 7 insertions(+), 38 deletions(-)
Comment 16 Vladimir Druzenko freebsd_committer freebsd_triage 2025-11-15 18:42:17 UTC
Thanks!

Update JAVA_VERSION we can do in separate commit.

Also waiting decke@ for approve update devel/kodi-platform or 2 weeks timeout - 1 week left.
Comment 17 yzrh 2025-11-16 11:43:48 UTC
(In reply to Vladimir Druzenko from comment #16)

We did that in https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=287946.
Building with later Java versions may or may not work.

From https://groovy-lang.org/install.html#_prerequisites:

Groovy 5.0 requires Java 8+ with support for up to Java 16.
Comment 18 Bernhard Froehlich freebsd_committer freebsd_triage 2025-11-16 12:13:11 UTC
devel/kodi-platform update is approved. Thanks!

But how do you think I would know about the patch if you just post it somewhere as a comment? I just found this out of pure luck.
Comment 19 Vladimir Druzenko freebsd_committer freebsd_triage 2025-11-16 14:19:43 UTC
(In reply to yzrh from comment #17)
I completely forgot about this PR.

(In reply to Bernhard Froehlich from comment #18)
I added you to the CC of this PR along with comment with the patch.
Sorry, I saved time on creating a separate PR and even a patch file, because the patch is trivial.
Comment 20 commit-hook freebsd_committer freebsd_triage 2025-11-16 15:17:38 UTC
A commit in branch main references this bug:

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

commit f6d3b0c888f7461d67c06f22b8f09e6ffbfc10e9
Author:     Vladimir Druzenko <vvd@FreeBSD.org>
AuthorDate: 2025-11-16 15:14:56 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2025-11-16 15:14:56 +0000

    devel/kodi-platform: Update 20190726 => 20250416

    Commit log:
    https://github.com/xbmc/kodi-platform/compare/809c5e9...kodiplatform-20250416

    PR:             290895
    Approved by:    decke (maitainer)

 devel/kodi-platform/Makefile  | 5 ++---
 devel/kodi-platform/distinfo  | 6 +++---
 devel/kodi-platform/pkg-plist | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)