gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-08-05 12:38:09 -07:00
Code Issues Projects Releases Wiki Activity

media-tv/kodi: update Omega branch

Browse Source 
Upstream commit: 7b7e20eaaa831d7740d151bdfe22c3257f5a4102

Also address MissingPackageRevision and use ffmpeg-compat just like the
in the non live Omega branch ebuild.

Signed-off-by: Alfred Wingate <parona@protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/43512
Closes: https://github.com/gentoo/gentoo/pull/43512
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Alfred Wingate
2025-08-21 00:15:25 +03:00
committed by Sam James
parent dfcc6f4e75
commit d989500aee
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
media-tv/kodi/kodi-21.9999.ebuild
View File

@@ -15,9 +15,9 @@ LIBDVDNAV_VERSION="6.1.1-Next-Nexus-Alpha2-2"
FFMPEG_VERSION="6.0.1"
# Java bundles from xbmc/interfaces/swig/CMakeLists.txt
GROOVY_VERSION="4.0.16"
APACHE_COMMON_LANG_VERSION="3.14.0"
APACHE_COMMON_TEXT_VERSION="1.11.0"
GROOVY_VERSION="4.0.26"
APACHE_COMMON_LANG_VERSION="3.17.0"
APACHE_COMMON_TEXT_VERSION="1.13.0"
_JAVA_PKG_WANT_BUILD_VM=( {openjdk{,-jre},icedtea}{,-bin}-{8,11,17,21} )
JAVA_PKG_WANT_BUILD_VM=${_JAVA_PKG_WANT_BUILD_VM[@]}
@@ -31,8 +31,8 @@ PYTHON_COMPAT=( python3_{10..13} )
# See cmake/scripts/common/ArchSetup.cmake for available options
CPU_FLAGS="cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_arm_neon"
inherit autotools cmake desktop flag-o-matic java-pkg-2 libtool linux-info optfeature pax-utils python-single-r1 \
toolchain-funcs xdg
inherit autotools cmake desktop ffmpeg-compat flag-o-matic java-pkg-2 libtool
inherit linux-info optfeature pax-utils python-single-r1 toolchain-funcs xdg
DESCRIPTION="A free and open source media-player and entertainment hub"
HOMEPAGE="https://kodi.tv/"
@@ -196,7 +196,7 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
>=net-fs/samba-3.4.6[smbclient(+)]
)
system-ffmpeg? (
=media-video/ffmpeg-6*:=[encode(+),soc(-)?,postproc(-),vaapi?,vdpau?,X?]
media-video/ffmpeg-compat:6=[encode(+),soc(-)?,postproc(-),vaapi?,vdpau?,X?]
)
!system-ffmpeg? (
app-arch/bzip2
@@ -263,7 +263,7 @@ BDEPEND="
dev-build/cmake
dev-lang/swig
virtual/pkgconfig
<=virtual/jre-21:*
<=virtual/jre-21-r9999:*
doc? (
app-text/doxygen
)
@@ -438,6 +438,13 @@ src_configure() {
mycmakeargs+=( -DENABLE_${name^^}=$(usex ${flag}) )
done
if use system-ffmpeg; then
# TODO: drop compat and allow using >=media-video/ffmpeg-7
ffmpeg_compat_setup 6
ffmpeg_compat_add_flags
mycmakeargs+=( -DFFMPEG_INCLUDE_DIRS="${SYSROOT}$(ffmpeg_compat_get_prefix 6)" )
fi
if ! is-flag -DNDEBUG && ! is-flag -D_DEBUG ; then
# Kodi requires one of the 'NDEBUG' or '_DEBUG' defines
append-cflags -DNDEBUG