diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest index f7c52ad..28e3773 100644 --- a/media-tv/kodi/Manifest +++ b/media-tv/kodi/Manifest @@ -1,13 +1,14 @@ AUX kodi-20.3-CDVDInputStreamFile-use-64K-read-chunk-size-when-filesystem.patch 1326 BLAKE2B 0a0900e464cf92e217c0b228e1b65482894601b5f7a277cbfaa547b1540ff3a5ade7aca05d37df151d2193a58dfa70df7765e83a246992b39b5a118df3ea8a59 SHA512 b4e5ead1d582d409004a091e134d6575857456951907521d4776326315c5db5e6ae9660e2a242c2824676a3afe05fcb21afc73db44bbedc36af135be1f3a082e AUX kodi-20.3-VideoPlayerAudio-invalidate-previous-sync-type-after-Audio.patch 1010 BLAKE2B e623854a71f0b53b90950fbbf71ee4d666a24c3071c6ae8489d476a8407068e01028a69c8ec5cbff909a646dd15efe7a1807aeee214995ae1486281bce309e30 SHA512 3db461ebad0f922fab7727e902beada28b5b43e2b71d9c6e39bdf9b2a7767d214ea6caf3a975649a27ba77b7a9a93d5e7b1df6c1ec0edf61223855e2463d5115 +AUX kodi-20.3-binutils-2.41.patch 3399 BLAKE2B 5608adfb32777371a71091de237e6173c72c272a5911e999c3e4bde6f0c0f788db644ccf1098ddabbbba7e6d2a0d65fbfa7570f6acf83cd351a6e779dd8b7f5f SHA512 aec2995737c78cf4ae3e9a4e9212f0481664fd91eb83e07d0bd354cede014015929628833e8b5a87fb19dda20d30abc5585d676a69bff3ee0111fb1f21bb87e7 AUX kodi-20.3-ffmpeg5.patch 94498 BLAKE2B f8244260911df037ec6cdf945fe19dae7e71e98c052c0ce3ec4c9bf5459205bef7696af599b00a86d5b554d0cbc674fed6f7835a45dd6df40ae4e83549e55175 SHA512 9dc21d7e41eac956816330e79e826456566a88c5fdc747be234fe873ff3b9e7241d87dcc6ecd804189fff8b61c027ac4e31e1af0da5de0537f91e8f51b3d96c5 AUX kodi-20.3-ffmpeg6.patch 24798 BLAKE2B d9ed0a7e8d0d873f46ffe95e84eefb94ca4f5328da80a447acd3996971b3b913a2ce249ddf8b5c4019db58e5fdb158b2c5d1034cd3962c8ca6d6aab34e9c6f15 SHA512 3e419a882a112bc9c12078f9c8f8c31c6eb5546f12e71e558f31a862ac8119999aa1e63c8e42cc654361534024e0483288da3bec62a45c601ecf7694c04a66c2 -AUX kodi-20.3-fix-build-with-swig-4.2.patch 446 BLAKE2B 6b11113506dce61aa951a3b8c533fa2478a6c686f309c79187dc681fa9ea7e813ac6c902f613b68293e6ce28ce81a30dd5f2705fdc58ab25984bf387a6d9b37c SHA512 8e570d10eff512f45ea926b3cf0af8167cab2ae5097d0e8602634d6948eb064e5196bc60d8a4d6b7a6145bea8a2dd295df0731b9d5e1081879f628520225e336 AUX kodi-20.3-fix-crash-in-avcodec_parameters_from_context.patch 1351 BLAKE2B 0c1739fbda97c0e5a8064c0242a2d1d2e5db499bf336abc8d0119398aef156128a114f1f8616cee235f09e39752df156d99f3049fd2f13693246526593c5e08f SHA512 34da97b3803b585f90f2e5fced64bc0c7447c36df73384df29f539348bc8d230bbb9fcdfa7a12baf2794d0d0e1493248723e012ebe3ac0862e1d4add06f64b94 AUX kodi-20.3-smart_ptr-and-custom-destructor-for-AVCodecParameters.patch 2113 BLAKE2B 4e6e3401c8b25297f633ff88457eda364de639e915b210d71a5905877c309bc81cf7d6e748307e76e8b9badca76024e313e7d32d88bba626642d4daa91e63357 SHA512 2b1a50e6f7f5eec62f2dc13cf3afb126cb0a05a5db7c87a5dfc9a4962b45c93c12ea71cb77fa007b4fab2a98109c08b1890a78cc5a85c99b658ac7e9648d0bcd -DIST ffmpeg-kodi-5.1.2-Nexus-Alpha3.tar.gz 14416966 BLAKE2B fe35ef6a9aa2d60a2b34432ae8063850003d550208f223ea43af8ebcaa73e6993639e8cfe8a38676bac79e6b1816bd791b75b66ef58ff4d740bc9a5e0e7f9b78 SHA512 ce60852b8456d6f4bfc60de0ceadb33034d9b3eea8c0bc84d8b7199984ecbf334a2c4d9b42eade439d0ef30ce22e3b2ca0a49d4df837a18cd3136b4343ed3113 +AUX kodi-20.3-swig-4.2.patch 446 BLAKE2B 6b11113506dce61aa951a3b8c533fa2478a6c686f309c79187dc681fa9ea7e813ac6c902f613b68293e6ce28ce81a30dd5f2705fdc58ab25984bf387a6d9b37c SHA512 8e570d10eff512f45ea926b3cf0af8167cab2ae5097d0e8602634d6948eb064e5196bc60d8a4d6b7a6145bea8a2dd295df0731b9d5e1081879f628520225e336 +DIST ffmpeg-kodi-4.4.1-Nexus-Alpha1.tar.gz 13725564 BLAKE2B 51d310e7000aeba657d55341c5fdb540474e197b85062228ab4b314c8309ec11985aa7f105193333fc6106529e8e58c86eafe268190894be8532d0e0b9065fa6 SHA512 8beb04d577b5251e74b0d52f4d130997a8ba94bbd488c7c8309e6b45095c27807e150212888ce3a384b23dff52f8df1a7bde5407bae924ddc363f8125c0616c5 DIST kodi-20.3-Nexus.tar.gz 54567232 BLAKE2B 956be2d1bef16910d88f244331bdff60cce309d9596ec7939a459489b7fa7ab3ca7b29e2aca0de542f48f95321d86c9d7a606ac311a7a3c69e0e6f901511982e SHA512 cdec1383d33f421828f0249ac2929980c6eaa39e345a8a364d9f3479f873029a15f3f6e6d40707fd2df2067a71bdaa3c6a1e26277074c31c631c71afe7465cb4 DIST libdvdcss-1.4.3-Next-Nexus-Alpha2-2.tar.gz 102124 BLAKE2B 2f503d3ab767094958f7ec10b4ad11ffd02665deee571c8f3c739bef5fc7e2ff84babc5a3fdee638dc095f896b72fe3ce65e6b688674cb5f7b7b77190992688c SHA512 d3be3bfc13c5ea56d8db745c2aab090c99760684fe4c8f62a13d266feb319e9180ceeecf8116bfd2ed90d9accba2c11dbbf93b61ad00f69a40812ebf4eabcdda DIST libdvdnav-6.1.1-Next-Nexus-Alpha2-2.tar.gz 128547 BLAKE2B db4d05836d8fbb3637ae50bdbfc0e4b612ee6b3be24addfea94ce772c3bf28d58b63a3f252d6f9f016f72f8cbb841cc1820b091226b136f4c4664385a32da73c SHA512 51e6fc033121241354a5f0b3fc9a430577ae3ff6bb7f31445aa548ef4893037fb80eea3b2c6774c81e9ebaf9c45e9b490c98c2c65eb38f9f7daba84b236f7e1d DIST libdvdread-6.1.3-Next-Nexus-Alpha2-2.tar.gz 110513 BLAKE2B c94feb5a03a12efa5b7767965118d2500a088299ea36f3b82e46d157e45893e6b04503cb50f179ca681bac914457607fab26acfa6e304752b355c407578572d1 SHA512 629a41157d07b8ec0ea1fe89ae5ec48f63047472a862782b805c531ae31a0376fc4dc15175f8280c3ef91d7fa977bacebb1b51232640034a34bab2293210fc5e -EBUILD kodi-20.3-r1.ebuild 11299 BLAKE2B 7008f8f2a6b26b103d5b504ef8dca3198d0c8c92827b44a456a6ec8ead165071bd231047a89101315d60e9e5f6949381e8268df28007c1c22301e077d71d35f0 SHA512 d15a3d70cae000751b98d5509abd6a5e2193f52f5e7a6d27415d9ed74d71a9e8c3c318efd12e9fb1313226c4dfa0ead38115e796e03da48cc14384efc108d86f +EBUILD kodi-20.3-r1.ebuild 12542 BLAKE2B 21c9c2571a61bb881dda3cf533890090cb196014f72acba268ba90440c72a2df484fe734ac0293b053cc0a1d4a973c654a4e193d66ce20574a94590910769db6 SHA512 dac40dafb5381d0138696f69bf6bb5e25a001b3155981c7830a58f2e8a454826a15b5dc28be06332bb88914c9237b51c260569f576f8b972ba03a91b8d574d5a diff --git a/media-tv/kodi/files/kodi-20.3-binutils-2.41.patch b/media-tv/kodi/files/kodi-20.3-binutils-2.41.patch new file mode 100644 index 0000000..6ee7a55 --- /dev/null +++ b/media-tv/kodi/files/kodi-20.3-binutils-2.41.patch @@ -0,0 +1,103 @@ +https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/effadce6c756247ea8bae32dc13bb3e6f464f0eb + +From db99a6e0ed9490478a7af7b6a3299688b1a329e1 Mon Sep 17 00:00:00 2001 +From: Alfred Wingate +Date: Sun, 24 Dec 2023 14:02:37 +0200 +Subject: [PATCH] ffmpeg: add patch to fix build against binutils-2.41 + +Signed-off-by: Alfred Wingate +--- a/cmake/modules/FindFFMPEG.cmake ++++ b/cmake/modules/FindFFMPEG.cmake +@@ -96,7 +96,9 @@ macro(buildFFMPEG) + -DPKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/pkgconfig) + set(PATCH_COMMAND ${CMAKE_COMMAND} -E copy + ${CMAKE_SOURCE_DIR}/tools/depends/target/ffmpeg/CMakeLists.txt +- ) ++ && ++ # patch internal ffmpeg, fix build against binutils 2.41 ++ patch -p1 < ${CMAKE_SOURCE_DIR}/tools/depends/target/ffmpeg/build-fix-for-binutils-2.41.patch) + + if(CMAKE_GENERATOR STREQUAL Xcode) + set(FFMPEG_GENERATOR CMAKE_GENERATOR "Unix Makefiles") +--- /dev/null ++++ b/tools/depends/target/ffmpeg/build-fix-for-binutils-2.41.patch +@@ -0,0 +1,76 @@ ++From effadce6c756247ea8bae32dc13bb3e6f464f0eb Mon Sep 17 00:00:00 2001 ++From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= ++Date: Sun, 16 Jul 2023 18:18:02 +0300 ++Subject: [PATCH] avcodec/x86/mathops: clip constants used with shift ++ instructions within inline assembly ++ ++Fixes assembling with binutil as >= 2.41 ++ ++Signed-off-by: James Almer ++--- ++ libavcodec/x86/mathops.h | 26 +++++++++++++++++++++++--- ++ 1 file changed, 23 insertions(+), 3 deletions(-) ++ ++diff --git a/libavcodec/x86/mathops.h b/libavcodec/x86/mathops.h ++index 6298f5ed19..ca7e2dffc1 100644 ++--- a/libavcodec/x86/mathops.h +++++ b/libavcodec/x86/mathops.h ++@@ -35,12 +35,20 @@ ++ static av_always_inline av_const int MULL(int a, int b, unsigned shift) ++ { ++ int rt, dummy; +++ if (__builtin_constant_p(shift)) ++ __asm__ ( ++ "imull %3 \n\t" ++ "shrdl %4, %%edx, %%eax \n\t" ++ :"=a"(rt), "=d"(dummy) ++- :"a"(a), "rm"(b), "ci"((uint8_t)shift) +++ :"a"(a), "rm"(b), "i"(shift & 0x1F) ++ ); +++ else +++ __asm__ ( +++ "imull %3 \n\t" +++ "shrdl %4, %%edx, %%eax \n\t" +++ :"=a"(rt), "=d"(dummy) +++ :"a"(a), "rm"(b), "c"((uint8_t)shift) +++ ); ++ return rt; ++ } ++ ++@@ -113,19 +121,31 @@ __asm__ volatile(\ ++ // avoid +32 for shift optimization (gcc should do that ...) ++ #define NEG_SSR32 NEG_SSR32 ++ static inline int32_t NEG_SSR32( int32_t a, int8_t s){ +++ if (__builtin_constant_p(s)) ++ __asm__ ("sarl %1, %0\n\t" ++ : "+r" (a) ++- : "ic" ((uint8_t)(-s)) +++ : "i" (-s & 0x1F) ++ ); +++ else +++ __asm__ ("sarl %1, %0\n\t" +++ : "+r" (a) +++ : "c" ((uint8_t)(-s)) +++ ); ++ return a; ++ } ++ ++ #define NEG_USR32 NEG_USR32 ++ static inline uint32_t NEG_USR32(uint32_t a, int8_t s){ +++ if (__builtin_constant_p(s)) ++ __asm__ ("shrl %1, %0\n\t" ++ : "+r" (a) ++- : "ic" ((uint8_t)(-s)) +++ : "i" (-s & 0x1F) ++ ); +++ else +++ __asm__ ("shrl %1, %0\n\t" +++ : "+r" (a) +++ : "c" ((uint8_t)(-s)) +++ ); ++ return a; ++ } ++ ++-- ++2.25.1 ++ +-- +2.43.0 + diff --git a/media-tv/kodi/files/kodi-20.3-fix-build-with-swig-4.2.patch b/media-tv/kodi/files/kodi-20.3-swig-4.2.patch similarity index 100% rename from media-tv/kodi/files/kodi-20.3-fix-build-with-swig-4.2.patch rename to media-tv/kodi/files/kodi-20.3-swig-4.2.patch diff --git a/media-tv/kodi/kodi-20.3-r1.ebuild b/media-tv/kodi/kodi-20.3-r1.ebuild index 23c510f..9f4b35e 100644 --- a/media-tv/kodi/kodi-20.3-r1.ebuild +++ b/media-tv/kodi/kodi-20.3-r1.ebuild @@ -1,22 +1,56 @@ -# Copyright 2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_REQ_USE="sqlite,ssl" +# FFmpeg can be unbundled, but is currently stuck at a very old version. +# libdvd{css,read,nav} are not unbundlable without patching the buildsystem. + +# Versions for the forked projects that are bundled +# See tools/depends/target//-VERSION LIBDVDCSS_VERSION="1.4.3-Next-Nexus-Alpha2-2" LIBDVDREAD_VERSION="6.1.3-Next-Nexus-Alpha2-2" LIBDVDNAV_VERSION="6.1.1-Next-Nexus-Alpha2-2" -FFMPEG_VERSION="5.1.2-Nexus-Alpha3" +FFMPEG_VERSION="4.4.1" CODENAME="Nexus" -PYTHON_COMPAT=( python3_{10,11} ) -SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz -> libdvdcss-${LIBDVDCSS_VERSION}.tar.gz - https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_VERSION}.tar.gz -> libdvdread-${LIBDVDREAD_VERSION}.tar.gz - https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_VERSION}.tar.gz -> libdvdnav-${LIBDVDNAV_VERSION}.tar.gz - !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}.tar.gz )" +FFMPEG_KODI_VERSION="Alpha1" + +# Doesn't build with jdk-21 +_JAVA_PKG_WANT_BUILD_VM=( {openjdk{,-jre},icedtea}{,-bin}-{8,11,17} ) +JAVA_PKG_WANT_BUILD_VM=${_JAVA_PKG_WANT_BUILD_VM[@]} +# Required to be set, but not used. +JAVA_PKG_WANT_SOURCE="17" +JAVA_PKG_WANT_TARGET="17" + +PYTHON_REQ_USE="sqlite,ssl" +PYTHON_COMPAT=( python3_{10..11} ) # python3.12 support added in 21 + +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 cmake desktop flag-o-matic java-pkg-2 linux-info optfeature pax-utils python-single-r1 xdg + +DESCRIPTION="A free and open source media-player and entertainment hub" +HOMEPAGE="https://kodi.tv/" + +SRC_URI=" + https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_VERSION}.tar.gz + -> libdvdnav-${LIBDVDNAV_VERSION}.tar.gz + https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_VERSION}.tar.gz + -> libdvdread-${LIBDVDREAD_VERSION}.tar.gz + css? ( + https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz + -> libdvdcss-${LIBDVDCSS_VERSION}.tar.gz + ) + !system-ffmpeg? ( + https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz + -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz + ) +" if [[ ${PV} == *9999 ]] ; then EGIT_REPO_URI="https://github.com/xbmc/xbmc.git" - EGIT_BRANCH="Nexus" + if [[ ${PV} != "9999" ]]; then + EGIT_BRANCH="${CODENAME}" + fi inherit git-r3 else MY_PV=${PV/_p/_r} @@ -26,163 +60,207 @@ else MY_PV="${MY_PV}-${CODENAME}" MY_P="${PN}-${MY_PV}" SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" S=${WORKDIR}/xbmc-${MY_PV} fi -inherit autotools cmake desktop libtool linux-info pax-utils python-single-r1 xdg - -DESCRIPTION="A free and open source media-player and entertainment hub" -HOMEPAGE="https://kodi.tv/ https://kodi.wiki/" - LICENSE="GPL-2+" SLOT="0" # use flag is called libusb so that it doesn't fool people in thinking that # it is _required_ for USB support. Otherwise they'll disable udev and # that's going to be worse. -IUSE="airplay alsa bluetooth bluray caps cec +css dav1d dbus eventclients gbm gles lcms libusb lirc mariadb mysql nfs +optical pipewire power-control pulseaudio raspberry-pi samba +system-ffmpeg test udf udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf" -IUSE="${IUSE} 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" +IUSE="airplay alsa bluetooth bluray caps cec +css dbus doc eventclients gbm gles lcms libusb lirc mariadb mysql nfs +optical pipewire pulseaudio raspberry-pi samba system-ffmpeg test udf udev upnp vaapi vdpau wayland webserver X +xslt zeroconf ${CPU_FLAGS}" REQUIRED_USE=" ${PYTHON_REQUIRED_USE} - || ( gbm wayland X ) + ^^ ( gbm wayland X ) ?? ( mariadb mysql ) bluray? ( udf ) + gbm? ( udev ) udev? ( !libusb ) - udisks? ( dbus ) - upower? ( dbus ) - power-control? ( dbus ) - vdpau? ( - X - !gles - !gbm - ) + vdpau? ( X !gles !gbm ) zeroconf? ( dbus ) " RESTRICT="!test? ( test )" +# dev-libs/libcec[-cubox] bug #818262 COMMON_DEPEND=" - >=dev-libs/lzo-2.04 >=dev-libs/flatbuffers-1.12.0:= - >=dev-libs/tinyxml2-9.0.0:= + >=dev-libs/lzo-2.04:2 + media-libs/giflib:= >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= + wayland? ( + dev-cpp/waylandpp:= + ) " COMMON_TARGET_DEPEND="${PYTHON_DEPS} - airplay? ( - >=app-pda/libplist-2.0.0 - net-libs/shairplay - ) - alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) - bluetooth? ( net-wireless/bluez ) - bluray? ( >=media-libs/libbluray-1.1.2 ) - caps? ( sys-libs/libcap ) - dbus? ( sys-apps/dbus ) - dev-db/sqlite + >=net-misc/curl-7.68.0[http2] + >=sys-libs/zlib-1.2.11 + dev-db/sqlite:3 dev-libs/crossguid >=dev-libs/fribidi-1.0.5 - cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) + >=dev-libs/libcdio-2.1.0:=[cxx] + >=dev-libs/libfmt-6.1.2:= + dev-libs/libfstrcmp dev-libs/libpcre[cxx] + >=dev-libs/openssl-1.1.1k:0= >=dev-libs/spdlog-1.5.0:= dev-libs/tinyxml[stl] + media-fonts/roboto + media-libs/libglvnd[X?] + >=media-libs/freetype-2.10.1 + media-libs/harfbuzz:= + >=media-libs/libass-0.13.4:= + media-libs/mesa[egl(+),gbm(+)?,wayland?,X?] + >=media-libs/taglib-1.9.0 + sci-libs/kissfft + virtual/libiconv + virtual/ttf-fonts + x11-libs/libdrm $(python_gen_cond_dep ' dev-python/pillow[${PYTHON_USEDEP}] dev-python/pycryptodome[${PYTHON_USEDEP}] ') - >=dev-libs/libcdio-2.1.0[cxx] - >=dev-libs/libfmt-6.1.2 - dev-libs/libfstrcmp + airplay? ( + >=app-pda/libplist-2.0.0:= + net-libs/shairplay + ) + alsa? ( + >=media-libs/alsa-lib-1.1.4.1 + ) + bluetooth? ( + net-wireless/bluez:= + ) + bluray? ( + >=media-libs/libbluray-1.1.2:= + ) + caps? ( + sys-libs/libcap + ) + cec? ( + >=dev-libs/libcec-4.0[-cubox,raspberry-pi?] + ) + dbus? ( + sys-apps/dbus + ) gbm? ( - >=dev-libs/libinput-1.10.5 - media-libs/mesa[gbm(+)] + >=dev-libs/libinput-1.10.5:= x11-libs/libxkbcommon ) gles? ( - !raspberry-pi? ( media-libs/mesa[gles2] ) + !raspberry-pi? ( + media-libs/mesa[gles2] + ) + ) + !gles? ( + media-libs/glu + ) + lcms? ( + >=media-libs/lcms-2.10:2 + ) + libusb? ( + virtual/libusb:1 + ) + lirc? ( + app-misc/lirc + ) + mariadb? ( + dev-db/mariadb-connector-c:= + ) + mysql? ( + dev-db/mysql-connector-c:= + ) + nfs? ( + >=net-fs/libnfs-2.0.0:= + ) + pipewire? ( + >=media-video/pipewire-0.3.24:= + ) + pulseaudio? ( + media-libs/libpulse + ) + raspberry-pi? ( + || ( + media-libs/raspberrypi-userland + media-libs/raspberrypi-userland-bin + media-libs/mesa[gles2,video_cards_vc4] + ) + ) + samba? ( + >=net-fs/samba-3.4.6[smbclient(+)] ) - lcms? ( media-libs/lcms:2 ) - libusb? ( virtual/libusb:1 ) - virtual/ttf-fonts - media-fonts/roboto - >=media-libs/freetype-2.10.1 - >=media-libs/libass-0.13.4 - !raspberry-pi? ( media-libs/mesa[egl(+)] ) - >=media-libs/taglib-1.11.1 system-ffmpeg? ( - >=media-video/ffmpeg-4.4:=[dav1d?,encode,openssl,postproc] - media-video/ffmpeg[openssl] + media-video/ffmpeg:=[openssl,encode,postproc,vaapi?,vdpau?,X?] ) !system-ffmpeg? ( app-arch/bzip2 - dav1d? ( media-libs/dav1d:= ) + media-libs/dav1d:= ) - mysql? ( dev-db/mysql-connector-c:= ) - mariadb? ( dev-db/mariadb-connector-c:= ) - >=net-misc/curl-7.68.0[http2] - nfs? ( >=net-fs/libnfs-2.0.0:= ) - !gles? ( media-libs/glu ) - >=dev-libs/openssl-1.1.1k:0= - raspberry-pi? ( - || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl(+),gles2,video_cards_vc4] ) + udf? ( + >=dev-libs/libudfread-1.0.0 + ) + udev? ( + virtual/libudev:= ) - pipewire? ( media-video/pipewire ) - pulseaudio? ( media-sound/pulseaudio ) - samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) - >=sys-libs/zlib-1.2.11 - udf? ( >=dev-libs/libudfread-1.0.0 ) - udev? ( virtual/udev ) vaapi? ( - media-libs/libva:= - system-ffmpeg? ( media-video/ffmpeg[vaapi] ) - wayland? ( media-libs/libva[wayland] ) - X? ( media-libs/libva[X] ) + media-libs/libva:=[wayland?,X?] ) - virtual/libiconv vdpau? ( - || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) - system-ffmpeg? ( media-video/ffmpeg[vdpau] ) + || ( + >=x11-libs/libvdpau-1.1 + >=x11-drivers/nvidia-drivers-180.51 + ) ) wayland? ( - >=dev-cpp/waylandpp-1.0.0-r1:= - media-libs/mesa[wayland] - >=dev-libs/wayland-protocols-1.7 - >=x11-libs/libxkbcommon-0.4.1 + >=x11-libs/libxkbcommon-0.4.1[wayland] + ) + webserver? ( + >=net-libs/libmicrohttpd-0.9.55:=[messages(+)] ) - webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( - media-libs/mesa[X] - !gles? ( media-libs/libglvnd[X] ) x11-libs/libX11 + x11-libs/libXext x11-libs/libXrandr - x11-libs/libXrender - system-ffmpeg? ( media-video/ffmpeg[X] ) ) - x11-libs/libdrm xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.9.4 ) - zeroconf? ( net-dns/avahi[dbus] ) + zeroconf? ( + net-dns/avahi[dbus] + ) " -RDEPEND="${COMMON_DEPEND} ${COMMON_TARGET_DEPEND} - lirc? ( app-misc/lirc ) - power-control? ( || ( sys-apps/systemd sys-auth/elogind ) ) - udisks? ( sys-fs/udisks:2 ) - upower? ( sys-power/upower ) +RDEPEND=" + ${COMMON_DEPEND} + ${COMMON_TARGET_DEPEND} " -DEPEND="${COMMON_DEPEND} ${COMMON_TARGET_DEPEND} +DEPEND=" + ${COMMON_DEPEND} + ${COMMON_TARGET_DEPEND} dev-libs/rapidjson - test? ( >=dev-cpp/gtest-1.10.0 ) + test? ( + >=dev-cpp/gtest-1.10.0 + ) + wayland? ( + >=dev-libs/wayland-protocols-1.7 + ) + X? ( + x11-base/xorg-proto + x11-libs/libXrender + ) " -BDEPEND="${COMMON_DEPEND} +BDEPEND=" + ${COMMON_DEPEND} + dev-build/cmake dev-lang/swig - media-libs/giflib - >=dev-libs/flatbuffers-1.11.0 - >=media-libs/libjpeg-turbo-2.0.4:= - >=media-libs/libpng-1.6.26:0= virtual/pkgconfig - virtual/jre + <=virtual/jre-17:* + doc? ( + app-text/doxygen + ) " +# bug #544020 CONFIG_CHECK="~IP_MULTICAST" ERROR_IP_MULTICAST=" In some cases Kodi needs to access multicast addresses. @@ -196,11 +274,13 @@ PATCHES=( "${FILESDIR}"/${P}-fix-crash-in-avcodec_parameters_from_context.patch "${FILESDIR}"/${P}-smart_ptr-and-custom-destructor-for-AVCodecParameters.patch "${FILESDIR}"/${P}-CDVDInputStreamFile-use-64K-read-chunk-size-when-filesystem.patch - "${FILESDIR}"/${P}-fix-build-with-swig-4.2.patch + "${FILESDIR}"/${P}-swig-4.2.patch + "${FILESDIR}"/${P}-binutils-2.41.patch ) pkg_setup() { check_extra_config + java-pkg-2_pkg_setup python-single-r1_pkg_setup } @@ -208,7 +288,7 @@ src_unpack() { if [[ ${PV} == *9999 ]] ; then git-r3_src_unpack else - default + unpack ${MY_P}.tar.gz fi } @@ -220,71 +300,52 @@ src_prepare() { -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \ xbmc/platform/linux/*.cpp || die - # Prepare tools and libs witch are configured with autotools during compile time - AUTOTOOLS_DIRS=( - "${S}"/tools/depends/native/TexturePacker/src - "${S}"/tools/depends/native/JsonSchemaBuilder/src - ) - - local d - for d in "${AUTOTOOLS_DIRS[@]}" ; do - pushd ${d} >/dev/null || die - AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" eautoreconf - popd >/dev/null || die + # Add all possible names for kissfft libraries + for datatype in {float,int16,int32,simd}; do + sed -i \ + -e "s/\(find_library(KISSFFT_LIBRARY NAMES .*\)/\1 kissfft-${datatype} kissfft-${datatype}-openmp/" \ + cmake/modules/FindKissFFT.cmake || die done - elibtoolize - - # Prevent autoreconf rerun - sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \ - "${S}"/tools/depends/native/TexturePacker/src/autogen.sh \ - "${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh \ - || die } src_configure() { - local platform=() - use gbm && platform+=( gbm ) - use wayland && platform+=( wayland ) - use X && platform+=( x11 ) - local core_platform_name="${platform[@]}" local mycmakeargs=( - -Wno-dev - -DENABLE_SSE=$(usex cpu_flags_x86_sse) - -DENABLE_SSE2=$(usex cpu_flags_x86_sse2) - -DENABLE_SSE3=$(usex cpu_flags_x86_sse3) - -DENABLE_SSE4_1=$(usex cpu_flags_x86_sse4_1) - -DENABLE_SSE4_2=$(usex cpu_flags_x86_sse4_2) - -DENABLE_AVX=$(usex cpu_flags_x86_avx) - -DENABLE_AVX2=$(usex cpu_flags_x86_avx2) - -DENABLE_NEON=$(usex cpu_flags_arm_neon) + -Wno-dev # less noise + + -DAPP_RENDER_SYSTEM=$(usex gles gles gl) + -DCORE_PLATFORM_NAME=$(usev gbm)$(usev wayland)$(usev X x11) -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" + -DENABLE_TESTING=$(usex test) -DVERBOSE=ON - -DENABLE_GOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124 - -DENABLE_ALSA=$(usex alsa) - -DENABLE_AIRTUNES=$(usex airplay) - -DENABLE_AVAHI=$(usex zeroconf) - -DENABLE_BLUETOOTH=$(usex bluetooth) - -DENABLE_BLURAY=$(usex bluray) + + # Enforce use of configured python interpeter + -DPYTHON_PATH=$(python_get_library_path) + -DPYTHON_VER=${EPYTHON##python} # wont work for pypy + + # Toolchain -DENABLE_CCACHE=OFF -DENABLE_CLANGFORMAT=OFF -DENABLE_CLANGTIDY=OFF -DENABLE_CPPCHECK=OFF - -DENABLE_ISO9660PP=$(usex optical) + -DENABLE_INCLUDEWHATYOUUSE=OFF + # https://bugs.gentoo.org/show_bug.cgi?id=606124 + -DENABLE_GOLD=OFF + -DENABLE_LLD=OFF + -DENABLE_MOLD=OFF + -DUSE_LTO=OFF + + # Features + -DENABLE_AIRTUNES=$(usex airplay) + -DENABLE_ALSA=$(usex alsa) + -DENABLE_AVAHI=$(usex zeroconf) + -DENABLE_BLUETOOTH=$(usex bluetooth) + -DENABLE_BLURAY=$(usex bluray) + -DENABLE_CAP=$(usex caps) -DENABLE_CEC=$(usex cec) -DENABLE_DBUS=$(usex dbus) -DENABLE_DVDCSS=$(usex css) - -DENABLE_EVENTCLIENTS=ON # always enable to have 'kodi-send' and filter extra staff in 'src_install()' - -DENABLE_INTERNAL_CROSSGUID=OFF - -DENABLE_INTERNAL_RapidJSON=OFF - -DENABLE_INTERNAL_FMT=OFF - -DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)" - -DENABLE_INTERNAL_FSTRCMP=OFF - -DENABLE_INTERNAL_FLATBUFFERS=OFF - -DENABLE_INTERNAL_DAV1D=OFF - -DENABLE_INTERNAL_GTEST=OFF - -DENABLE_INTERNAL_UDFREAD=OFF - -DENABLE_INTERNAL_SPDLOG=OFF - -DENABLE_CAP=$(usex caps) + -DENABLE_EVENTCLIENTS=ON # alway enable to have 'kodi-send' and filter extra staff in 'src_install()' + -DENABLE_ISO9660PP=$(usex optical) -DENABLE_LCMS2=$(usex lcms) -DENABLE_LIRCCLIENT=$(usex lirc) -DENABLE_MARIADBCLIENT=$(usex mariadb) @@ -292,65 +353,99 @@ src_configure() { -DENABLE_MICROHTTPD=$(usex webserver) -DENABLE_MYSQLCLIENT=$(usex mysql) -DENABLE_NFS=$(usex nfs) - -DENABLE_OPENGLES=$(usex gles) -DENABLE_OPENGL=$(usex !gles) + -DENABLE_OPENGLES=$(usex gles) -DENABLE_OPTICAL=$(usex optical) - -DENABLE_PLIST=$(usex airplay) -DENABLE_PIPEWIRE=$(usex pipewire) + -DENABLE_PLIST=$(usex airplay) -DENABLE_PULSEAUDIO=$(usex pulseaudio) -DENABLE_SMBCLIENT=$(usex samba) -DENABLE_SNDIO=OFF - -DENABLE_TESTING=$(usex test) -DENABLE_UDEV=$(usex udev) -DENABLE_UDFREAD=$(usex udf) -DENABLE_UPNP=$(usex upnp) -DENABLE_VAAPI=$(usex vaapi) -DENABLE_VDPAU=$(usex vdpau) -DENABLE_XSLT=$(usex xslt) - -Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_VERSION}.tar.gz" + + #To bundle or not + -DENABLE_INTERNAL_CROSSGUID=OFF + -DENABLE_INTERNAL_DAV1D=OFF + -DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)" + -DENABLE_INTERNAL_FLATBUFFERS=OFF + -DENABLE_INTERNAL_FMT=OFF + -DENABLE_INTERNAL_FSTRCMP=OFF + -DENABLE_INTERNAL_GTEST=OFF + -DENABLE_INTERNAL_KISSFFT=OFF + -DENABLE_INTERNAL_PCRE=OFF + -DENABLE_INTERNAL_RapidJSON=OFF + -DENABLE_INTERNAL_SPDLOG=OFF + -DENABLE_INTERNAL_TAGLIB=OFF + -DENABLE_INTERNAL_UDFREAD=OFF + + -DWITH_FFMPEG=$(usex system-ffmpeg) + -Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_VERSION}.tar.gz" - -Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_VERSION}.tar.gz" - -DPYTHON_VER="${EPYTHON#python}" - -DAPP_RENDER_SYSTEM="$(usex gles gles gl)" - -DCORE_PLATFORM_NAME="${core_platform_name}" + -Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_VERSION}.tar.gz" ) + # Separated to avoid "Manually-specified variables were not used by the project:" + use css && mycmakeargs+=( -Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_VERSION}.tar.gz" ) + use !system-ffmpeg && mycmakeargs+=( + -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz" + ) + use nfs && mycmakeargs+=( -DENABLE_INTERNAL_NFS=OFF ) use !udev && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) ) - use X && use !gles && mycmakeargs+=( -DENABLE_GLX=ON ) - if use system-ffmpeg; then - mycmakeargs+=( -DWITH_FFMPEG="YES" ) - else - mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}.tar.gz" ) + for flag in ${CPU_FLAGS[@]} ; do + local name=${flag#cpu_flags_*_} + mycmakeargs+=( -DENABLE_${name^^}=$(usex ${flag}) ) + done + + if ! is-flag -DNDEBUG && ! is-flag -D_DEBUG ; then + # Kodi requires one of the 'NDEBUG' or '_DEBUG' defines + append-cflags -DNDEBUG + append-cxxflags -DNDEBUG fi - if ! echo "${CFLAGS}" | grep -Fwqe '-DNDEBUG' - && ! echo "${CFLAGS}" | grep -Fwqe '-D_DEBUG' - ; then - CFLAGS+=' -DNDEBUG' # Kodi requires one of the 'NDEBUG' or '_DEBUG' defines - CXXFLAGS+=' -DNDEBUG' - fi + # Violates ODR (bug #860984) and USE_LTO does spooky stuff + # https://github.com/xbmc/xbmc/commit/cb72a22d54a91845b1092c295f84eeb48328921e + filter-lto cmake_src_configure } src_compile() { cmake_src_compile all + use doc && cmake_build doc + use test && cmake_build kodi-test } src_test() { - local myctestargs=( + local -x CMAKE_SKIP_TESTS=( # Known failing, unreliable test # bug #743938 - -E "(TestCPUInfo.GetCPUFrequency)" + TestCPUInfo.GetCPUFrequency + # Test failure stemming from sci-libs/kissfft + # The difference between output[2i] and (i==freq1?1.0:0.0) is inf, which exceeds 1e-7, where output[2i] + # evaluates to inf,(i==freq1?1.0:0.0) evaluates to 0, and 1e-7 evaluates to 9.9999999999999995e-08. + TestRFFT.SimpleSignal + # bug #779184 + # https://github.com/xbmc/xbmc/issues/18594 + $(usev x86 TestDateTime.SetFromDBTime) ) # see https://github.com/xbmc/xbmc/issues/17860#issuecomment-630120213 - KODI_HOME="${BUILD_DIR}" cmake_build check + local -x KODI_HOME="${BUILD_DIR}" + + cmake_src_test } src_install() { cmake_src_install + # bug #457588 pax-mark Em "${ED}"/usr/$(get_libdir)/${PN}/${PN}.bin newicon media/icon48x48.png kodi.png @@ -368,4 +463,17 @@ src_install() { fi python_optimize "${D}$(python_get_sitedir)" + + einstalldocs + use doc && dodoc -r "${S}"/docs/html/ +} + +pkg_postinst() { + xdg_pkg_postinst + + if use dbus ; then + optfeature "getting battery level and active power source" sys-power/upower + optfeature "control of shutdown, reboot, suspend, and hibernate" sys-auth/elogind sys-apps/systemd + optfeature "storage management support (automounting, volume monitoring, etc)" sys-fs/udisks:2 + fi }