diff options
Diffstat (limited to 'media-tv/kodi')
| -rw-r--r-- | media-tv/kodi/Manifest | 3 | ||||
| -rw-r--r-- | media-tv/kodi/files/kodi-21.2-pipewire-1.4.0-fix.patch | 27 | ||||
| -rw-r--r-- | media-tv/kodi/kodi-21.2-r2.ebuild | 11 |
3 files changed, 36 insertions, 5 deletions
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest index db76ce2738bb..d4d5bad1b2a8 100644 --- a/media-tv/kodi/Manifest +++ b/media-tv/kodi/Manifest @@ -2,6 +2,7 @@ AUX kodi-21-optional-ffmpeg-libx11.patch 549 BLAKE2B d828232075cf76a0655ec9f0410 AUX kodi-21.1-fix-gcc15.patch 2463 BLAKE2B 769d4830d13ad0fa0eb5d7ebfe03d44d5e5c8642f5ef484534551ad970a980aaf7f8413b2b98ebcfd4fa2fb3a08b0d3099a16f044908791ae057ec3e639294e1 SHA512 88fa94678bd81c7182c6890fd314916fbd52ca8374994b41ac2b5b512556d0b9df38eb390ed238b396a496582c0b47c1efc5fbd6e9e26508c7e9c5a9f13c3689 AUX kodi-21.1-fix-swig-4.3.0-build-pr25863.patch 1491 BLAKE2B 081cd116a6d5d205ac2a44d6c7e89bbe0c942fe992a752057ffd35a65b9fefebf342f37011b32fd1ba3792ada2bfdb63472e252fd8e5279a0bd059386d2c38b9 SHA512 56245db7819f10ace18544450d63f38fd4cab5966edd40abf19ad66e93f997f63c10f154dc25fd0bd23c9e93e1cc8ef84add368db83d52c649ff484877732d8b AUX kodi-21.1-silence-libdvdread-git.patch 1107 BLAKE2B 395d4677a5856fcfe22fd7e86828b989abccbf869ca2dc5d844efea895b3a4c0ea9633cc0f049d78ac215967aa52b871b79fc0fd3e2a78a0595e9b4156e3d845 SHA512 5b7679e5057fb56ab1af7a774251ec8ae3baa8622c809e77cb3495f5a421396c900a544d35df3d203e43426dd1b217a5a134505fc081423853d4b1764b788a0a +AUX kodi-21.2-pipewire-1.4.0-fix.patch 1242 BLAKE2B ec9a6b34c942828afd773e057cbaa63cb7d6a44f3966b0e72b5060bca2f71d5e89c7280346edb7b1cfd55a27e94a64ecea87b57158dbbef8e53bb69fdc660b60 SHA512 429b6a49345725415cf27265ae994e0cebf667a4d17757d6c3849feeb411aae6ab15b34d77d8e7bd9b65401c25f432675d9981b4126f985b3226521aa1f16971 AUX kodi-22-silence-libdvdread-git.patch 1134 BLAKE2B 8dad2d1fa2d0f7677a595647e7518d67611de125949d895487b4ba37e76f06729afc22010e70a0bf0f48559f776767ee6847e682e6ddc2299ff264c257b54e90 SHA512 df05191938e83e71ec2ad10949608bfc584e4cb4be14f4c8f4ed01ec708df36650578c3432c0cbb596e5c52dad8b2f94da61fb4d7bd207445fae4a0f32110bf9 DIST apache-groovy-binary-4.0.16.zip 29793704 BLAKE2B 30f77c6400c85821cf78f6ba1070da1e68644531f85f71cf7695443b13b81393cc89d4103eb869d1523f0a22a6e1c3428dcabf4f79c8a2c6eb2a6dea74e84e8f SHA512 743698979c801f3cfb36545888b5303e1e25dae5692bb45cab7ebbe102a6eda31f09abc6978349ad90ecaf630416fc87eacba7781244855e7e771a3c44041fa0 DIST commons-lang3-3.14.0-bin.tar.gz 9442785 BLAKE2B 2ecdd06f97ac2688220055a08f67da9b859bed3ab00ff41800d5d9a1cebda599db2e816425c10c265dd6827a0ef79fc3dd094a8b3c9b9ae4ceae8f5750a59cf2 SHA512 8e7e62418a49ba810512c13a640a8bf35f878fcd54af32fdaab1111e37817f58b21b475980ba663fba4887e45ef8d88af8ff17796f20d202e929e8e2574546dc @@ -15,7 +16,7 @@ DIST libdvdnav-6.1.1-Next-Nexus-Alpha2-2.tar.gz 128547 BLAKE2B db4d05836d8fbb363 DIST libdvdread-6.1.3-Next-Nexus-Alpha2-2.tar.gz 110513 BLAKE2B c94feb5a03a12efa5b7767965118d2500a088299ea36f3b82e46d157e45893e6b04503cb50f179ca681bac914457607fab26acfa6e304752b355c407578572d1 SHA512 629a41157d07b8ec0ea1fe89ae5ec48f63047472a862782b805c531ae31a0376fc4dc15175f8280c3ef91d7fa977bacebb1b51232640034a34bab2293210fc5e EBUILD kodi-21.1-r2.ebuild 14370 BLAKE2B f2b780da334facfe29a3d003737cc49009495a999472b25fca390f3dc7727f46ed2f1906ce9a434ec481f4f88e412def7a3db67b025af19c51e5de0749347829 SHA512 bbf617f8a4711a9e83b34dfaf3e2c2e2ea817b2c9427195bf32eafbf4ab42711a1285bc4e9913032f7e9e32219caac239e320419d0d776ac01a9ac365328f380 EBUILD kodi-21.2-r1.ebuild 14149 BLAKE2B 8adeaed6a54979aaf63712b00d06d28b72a31a807c431cb1007196a28e1bfc9c248c5612bb06b4dda0f9f04641811cb9e16d3044b9aa89f2463d02f5ea298329 SHA512 2d0cc9b50e0e9bb795c301a19317b92a44e64f9660ec2ca43f40d663fc4964572b00bc541d9fa7f5153ea5c3b78c849e47c28cc0bdbc4a231450947ab1b3c044 -EBUILD kodi-21.2-r2.ebuild 14363 BLAKE2B 9f14e2ef3b66d732df071df207cdacfb69c6bad35d8bd9284216d3ca5c90b5a6fcbad7f21404152bf71a1e1c7ecad7098efbb7c3435bb37707410b9cd63993e5 SHA512 7d70a99548a0bd09aa9cfc4ec44b88814b3bd41b4f99af959fa82754f4d3b882a42f5f1087d9e69e15fe9102cb77a5fbb353bae451f6ce3f2c831143af761c1f +EBUILD kodi-21.2-r2.ebuild 14449 BLAKE2B 58265284cb87bbd4cdfb26b877bbd7b91de13445efcf32c42696a5985e8b29c617a3185de82152c9e87e274107cf2e1c0ff94717563238cc3fcda33cca55a8e0 SHA512 ca14b9b912b30118ac77167ef1d95f0363c4195f0b5c02cf437093ab382898d89ca9bdc035310c71ce1082ebe04bcfa71394ad45848cf625b8999d6cb3fdd004 EBUILD kodi-21.9999.ebuild 14144 BLAKE2B 9b8441915eb191a3ad70bd51361bae428915e10cc06b071dca2ea4a877365b76cd90243288f0fd2bbfa126af038a645ef9e1e4fc7330636379ff62d9b81cabdc SHA512 59d46292745bf487013f31f07d6314ee266de92e19aaf1860d2e895d4ae68ede1191295734a1e09906b5e1fe468520cc6fb4248553eb14a4a0a7ec4d2dfe0a2e EBUILD kodi-9999.ebuild 13595 BLAKE2B eb72d75ca3f23b16902373e4749e84693bdf8749d50d35db46535aeadd5f60e62cf92c57ec8b7614f8b71ec146a1db288be3a1a279fb0d8a5e37e5850cc8666a SHA512 f0bf52e47d4f03f866f5e8bbe5426503082c962eeb59cc794f86a0dab374c2d2e3592395d26b609a968de50a1b03b3681dafcd32c4155e90a339bfa7d0d5ebe2 MISC metadata.xml 2555 BLAKE2B 65aeffc3e2130f686a6172d43bd077f86fc45932ace4b865b112d1849f3f3bc3e99d819f09b326d94f83f3834fd504d57405876e304f459e35a280dfcc198283 SHA512 d2219a960862ba094effebc372e0af2973876fa429e39a943298531888c104e36bebff9efd679778f40f1e3ba6dfe2f719545b77f29a70abfe78deb0a9b4d1f9 diff --git a/media-tv/kodi/files/kodi-21.2-pipewire-1.4.0-fix.patch b/media-tv/kodi/files/kodi-21.2-pipewire-1.4.0-fix.patch new file mode 100644 index 000000000000..4b82d11e1532 --- /dev/null +++ b/media-tv/kodi/files/kodi-21.2-pipewire-1.4.0-fix.patch @@ -0,0 +1,27 @@ +https://github.com/xbmc/xbmc/issues/26526 +https://github.com/xbmc/xbmc/commit/269053ebbfd3cc4a3156a511f54ab7f08a09a730 +https://github.com/xbmc/xbmc/pull/26502 +https://github.com/xbmc/xbmc/pull/26527 + +From e23a105b8988aba9b8401493bf6031a6878bd435 Mon Sep 17 00:00:00 2001 +From: Timo Gurr <timo.gurr@gmail.com> +Date: Fri, 7 Mar 2025 13:30:47 +0100 +Subject: [PATCH] [AudioEngine] PipeWire: Fix build with PipeWire 1.4.0 + +PipeWire >= 1.4.0 requires the correct struct type to be used, otherwise +it will fail to compile. + +Reference: https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/188d920733f0791413d3386e5536ee7377f71b2f +(cherry picked from commit 269053ebbfd3cc4a3156a511f54ab7f08a09a730) +--- a/xbmc/cores/AudioEngine/Sinks/pipewire/PipewireNode.cpp ++++ b/xbmc/cores/AudioEngine/Sinks/pipewire/PipewireNode.cpp +@@ -40,7 +40,8 @@ void CPipewireNode::EnumerateFormats() + for (uint32_t param = 0; param < m_info->n_params; param++) + { + if (m_info->params[param].id == SPA_PARAM_EnumFormat) +- pw_node_enum_params(m_proxy.get(), 0, m_info->params[param].id, 0, 0, NULL); ++ pw_node_enum_params(reinterpret_cast<struct pw_node*>(m_proxy.get()), 0, ++ m_info->params[param].id, 0, 0, NULL); + } + } + diff --git a/media-tv/kodi/kodi-21.2-r2.ebuild b/media-tv/kodi/kodi-21.2-r2.ebuild index 25537ab93fa6..f4a15f3264bf 100644 --- a/media-tv/kodi/kodi-21.2-r2.ebuild +++ b/media-tv/kodi/kodi-21.2-r2.ebuild @@ -272,6 +272,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/kodi-21-optional-ffmpeg-libx11.patch "${FILESDIR}"/kodi-21.1-silence-libdvdread-git.patch + "${FILESDIR}"/kodi-21.2-pipewire-1.4.0-fix.patch ) # bug #544020 @@ -438,10 +439,12 @@ src_configure() { mycmakeargs+=( -DENABLE_${name^^}=$(usex ${flag}) ) done - # 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)" ) + 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 |