diff options
Diffstat (limited to 'media-tv')
30 files changed, 338 insertions, 2307 deletions
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest index 3f1e09c883ae..343d43b19d9b 100644 --- a/media-tv/kodi/Manifest +++ b/media-tv/kodi/Manifest @@ -2,14 +2,7 @@ DIST apache-groovy-binary-4.0.16.zip 29793704 BLAKE2B 30f77c6400c85821cf78f6ba10 DIST commons-lang3-3.14.0-bin.tar.gz 9442785 BLAKE2B 2ecdd06f97ac2688220055a08f67da9b859bed3ab00ff41800d5d9a1cebda599db2e816425c10c265dd6827a0ef79fc3dd094a8b3c9b9ae4ceae8f5750a59cf2 SHA512 8e7e62418a49ba810512c13a640a8bf35f878fcd54af32fdaab1111e37817f58b21b475980ba663fba4887e45ef8d88af8ff17796f20d202e929e8e2574546dc DIST commons-text-1.11.0-bin.tar.gz 3018564 BLAKE2B c32e41c6b8c90dea876caf4c2cedc9358d5e49506bfee7aee42ac6b92dbe8505d5e5d81c860a739bb06214b832cc29e91ddb95f3cfc24515c970302a519a5e43 SHA512 2e94877000dd270b69e2e8cbf49f258a90b4c628b6b6b0814e300a2f0e9c391f0816dceb0707e596ae3b7c9532f93e7a4917df47c77f44b3a810e14042ce5f3f DIST ffmpeg-6.0.1.tar.gz 15437409 BLAKE2B 6424e30c6d354abbbea8a807822ae61589413189e9c4ba7aa51c307179287506b9072626e9745861fe83753c0015b50d179f9b4f298fe9abf74bee13936639af SHA512 945e34840092dc0fd3824eb1af2be79868af2afb4fe13159b19a9bcfc464cc4d53243c13ff065199290e9393ddbf4b1c5c8abccf83a31a31d6c7490e499fd1fc -DIST ffmpeg-kodi-4.3.2-Matrix-19.1.tar.gz 13490949 BLAKE2B 90007f2c4bac0e0a52b419d9333cf75b00e291f1ea7447cbdc579ee2f860de7c436c924253600f3fbd6e3faaabe97aaf46db083a5bbd2f5f03badcca5d643e89 SHA512 d3719253d674b16638b873545583b82fba3176803c81ba8bcb37e90456dd956f1c2ee8996493840cff2d61c6399f06ed0524a759f46e4ce174bce23e9c6eda4a -DIST ffmpeg-kodi-4.4.1-Nexus-Alpha1.tar.gz 13725564 BLAKE2B 51d310e7000aeba657d55341c5fdb540474e197b85062228ab4b314c8309ec11985aa7f105193333fc6106529e8e58c86eafe268190894be8532d0e0b9065fa6 SHA512 8beb04d577b5251e74b0d52f4d130997a8ba94bbd488c7c8309e6b45095c27807e150212888ce3a384b23dff52f8df1a7bde5407bae924ddc363f8125c0616c5 -DIST kodi-19.5-Matrix.tar.gz 53496968 BLAKE2B 89855e4d59faa5734e945e50267c2ec8d8e8bef91ecfa49ae49dd99f749a59609b55c57821042939082a8f98ea95f7edc3de0fa0494e218d454c67b79807ef87 SHA512 b560c068491a7f62894167da99be082f0e6a8a840cbfe1fb0cef5c844cda959bd3b5479a435b58616bb2a8454083ad393a4d49de05fbbdb0817a0fad9726e52f -DIST kodi-20.5-Nexus.tar.gz 54568445 BLAKE2B 15eb409918fa3768528d9abd24c52fd8b94c82699ef2ce10a529278fe25544dc335b66d137ae8ae304511cd92c1c0be34881937ec705ba936f5a4b0d737903f7 SHA512 a47a54ca11e1d3daeddea8c1ae716cd4461e3441de43a026a920c709b2ff5c7e0acc2a5fd4ac8c15f0da1940bd7f21a65eff32203ad8e167603c1576b21d4dcc -DIST kodi-21.0-Omega.tar.gz 40987733 BLAKE2B 33adaf588b3362dc9d184bfb66c36ad5fa2e442255da47db4813f926e73f5a607dd7de809ecf8a4982f985bc8dac53cba17fb9db6a009bb0cdb6284db3b1edb4 SHA512 9c2ca6b6e72197d2b1c26a47cf4ddc209318fcaa5a30ea20475ecc5518c7d1395c2e9cf3e3a75a13334b0505e7b417acdb0d76a20567a0c86841b3e69232625b -DIST libdvdcss-1.4.2-Leia-Beta-5.tar.gz 101068 BLAKE2B 283aa2cec0a2200d3569bc280cb9659e9224a6b3a77db8a35b269cd8caf1337ac9d8b92b806df66f63ef7458a46bd6261f0b8b14678b10e26644a79dcbeea5da SHA512 5185dbdbeb1bd13ea9d8723f1f4ab599d6f3102f5ba1096cd085aa1cda252c045f327c719227bba8e1b742352ade5e335106c8d0c1637a5a6b93ce661620dd7e +DIST kodi-21.1-Omega.tar.gz 41091890 BLAKE2B e711ef9b958ff3f8e006913ea6c42092164eeaae7011c2307f6d9846509e58db101a19dd51f4e95000de2f30ca2e77fd196187223d0ced7adad233d3ab57e286 SHA512 8458447c2a6d7ce0fdcfc7ec9b4ff1f8be0abf18a16804d245c3cef99408fcfb4b13aa18fca16c87e560316c97d281e214cf37fd7e17e243c1206c5575195dc8 DIST libdvdcss-1.4.3-Next-Nexus-Alpha2-2.tar.gz 102124 BLAKE2B 2f503d3ab767094958f7ec10b4ad11ffd02665deee571c8f3c739bef5fc7e2ff84babc5a3fdee638dc095f896b72fe3ce65e6b688674cb5f7b7b77190992688c SHA512 d3be3bfc13c5ea56d8db745c2aab090c99760684fe4c8f62a13d266feb319e9180ceeecf8116bfd2ed90d9accba2c11dbbf93b61ad00f69a40812ebf4eabcdda -DIST libdvdnav-6.0.0-Leia-Alpha-3.tar.gz 137942 BLAKE2B 7573434a0ae8e8ccabf48173f81fcde29074eb138e119a2ae9156cde3c3d8bfd716f5d0e605b97f2dcac21f570781137c8533c5ae306b51e3905822fda318355 SHA512 11c93eaacd156f8fd7dec7c43d366438b201f31ad55b2870463a9e286912b6ada08882319a021fb7992190f87b909a49f2b83e0321cc17aedc29f7fe5898fa72 DIST libdvdnav-6.1.1-Next-Nexus-Alpha2-2.tar.gz 128547 BLAKE2B db4d05836d8fbb3637ae50bdbfc0e4b612ee6b3be24addfea94ce772c3bf28d58b63a3f252d6f9f016f72f8cbb841cc1820b091226b136f4c4664385a32da73c SHA512 51e6fc033121241354a5f0b3fc9a430577ae3ff6bb7f31445aa548ef4893037fb80eea3b2c6774c81e9ebaf9c45e9b490c98c2c65eb38f9f7daba84b236f7e1d -DIST libdvdread-6.0.0-Leia-Alpha-3.tar.gz 130649 BLAKE2B 0c206acdaf0776841ab792c74e023af07d9539eb72e03ae164382a31ed950f60e5e15f1d055979d28f1398924471b294d11f064b11b8373353b3962a3777ff3c SHA512 b3419ba0a1a2dd70f1bb6236afdfe1c6e88c9ad4264198b289e3bba9375e077cecf7f89848c7b09debaa445327f3507101f3d157e692f7a7163b2bb52643e1e7 DIST libdvdread-6.1.3-Next-Nexus-Alpha2-2.tar.gz 110513 BLAKE2B c94feb5a03a12efa5b7767965118d2500a088299ea36f3b82e46d157e45893e6b04503cb50f179ca681bac914457607fab26acfa6e304752b355c407578572d1 SHA512 629a41157d07b8ec0ea1fe89ae5ec48f63047472a862782b805c531ae31a0376fc4dc15175f8280c3ef91d7fa977bacebb1b51232640034a34bab2293210fc5e diff --git a/media-tv/kodi/files/kodi-19.4-atomic.patch b/media-tv/kodi/files/kodi-19.4-atomic.patch deleted file mode 100644 index 3811fda8886d..000000000000 --- a/media-tv/kodi/files/kodi-19.4-atomic.patch +++ /dev/null @@ -1,108 +0,0 @@ -From ac3213e683e4c62c50dc02fef3b168d883245094 Mon Sep 17 00:00:00 2001 -From: Yixun Lan <dlan@gentoo.org> -Date: Tue, 9 Aug 2022 16:45:09 +0800 -Subject: [PATCH] [cmake] link atomic library for certain CPU architectures - -For those CPU architectures: -RISC-V lack 8-bit and 16-bit atomic instructions, and -ARM/MIPS/PPC lack 64-bit atomic instruction. - -GCC is supposed to convert these atomics via masking and shifting -like LLVM, which means anything that wants to use these instructions -needs the link option -latomic. - -In this patch, we will try to detect if 8-bit, 64-bit atomic instructions exist, -otherwise the atomic library will append to the DEPLIBS list. - -Original issue: -* https://gitlab.kitware.com/cmake/cmake/-/issues/23021#note_1098733 - -For reference: -* https://gcc.gnu.org/wiki/Atomic/GCCMM - -riscv64 specific: -* https://lists.debian.org/debian-riscv/2022/01/msg00009.html - -Signed-off-by: Yixun Lan <dlan@gentoo.org> ---- - cmake/modules/FindAtomic.cmake | 56 +++++++++++++++++++++++++++++ - cmake/scripts/linux/ArchSetup.cmake | 3 ++ - 2 files changed, 59 insertions(+) - create mode 100644 cmake/modules/FindAtomic.cmake - -diff --git a/cmake/modules/FindAtomic.cmake b/cmake/modules/FindAtomic.cmake -new file mode 100644 -index 0000000000..8ea3c815d7 ---- /dev/null -+++ b/cmake/modules/FindAtomic.cmake -@@ -0,0 +1,56 @@ -+#.rst: -+# FindAtomic -+# ----- -+# Finds the ATOMIC library -+# -+# This will define the following variables:: -+# -+# ATOMIC_FOUND - system has ATOMIC -+# ATOMIC_LIBRARIES - the ATOMIC libraries -+# -+# and the following imported targets:: -+# -+# ATOMIC::ATOMIC - The ATOMIC library -+ -+ -+include(CheckCXXSourceCompiles) -+ -+set(atomic_code -+ " -+ #include <atomic> -+ #include <cstdint> -+ std::atomic<uint8_t> n8 (0); // riscv64 -+ std::atomic<uint64_t> n64 (0); // armel, mipsel, powerpc -+ int main() { -+ ++n8; -+ ++n64; -+ return 0; -+ }") -+ -+check_cxx_source_compiles("${atomic_code}" ATOMIC_LOCK_FREE_INSTRUCTIONS) -+ -+if(ATOMIC_LOCK_FREE_INSTRUCTIONS) -+ set(ATOMIC_FOUND TRUE) -+ set(ATOMIC_LIBRARIES) -+else() -+ set(CMAKE_REQUIRED_LIBRARIES "-latomic") -+ check_cxx_source_compiles("${atomic_code}" ATOMIC_IN_LIBRARY) -+ set(CMAKE_REQUIRED_LIBRARIES) -+ if(ATOMIC_IN_LIBRARY) -+ set(ATOMIC_LIBRARY atomic) -+ include(FindPackageHandleStandardArgs) -+ find_package_handle_standard_args(Atomic DEFAULT_MSG ATOMIC_LIBRARY) -+ set(ATOMIC_LIBRARIES ${ATOMIC_LIBRARY}) -+ if(NOT TARGET ATOMIC::ATOMIC) -+ add_library(ATOMIC::ATOMIC UNKNOWN IMPORTED) -+ set_target_properties(ATOMIC::ATOMIC PROPERTIES -+ IMPORTED_LOCATION "${ATOMIC_LIBRARY}") -+ endif() -+ unset(ATOMIC_LIBRARY) -+ else() -+ if(Atomic_FIND_REQUIRED) -+ message(FATAL_ERROR "Neither lock free instructions nor -latomic found.") -+ endif() -+ endif() -+endif() -+unset(atomic_code) -diff --git a/cmake/scripts/linux/ArchSetup.cmake b/cmake/scripts/linux/ArchSetup.cmake -index 35ab1402f5..848723af1f 100644 ---- a/cmake/scripts/linux/ArchSetup.cmake -+++ b/cmake/scripts/linux/ArchSetup.cmake -@@ -199,3 +199,6 @@ if(NOT USE_INTERNAL_LIBS) - set(USE_INTERNAL_LIBS OFF) - endif() - endif() -+ -+# Atomic library -+list(APPEND PLATFORM_REQUIRED_DEPS Atomic) --- -2.35.1 - diff --git a/media-tv/kodi/files/kodi-19.4-dav1d-1.0.0.patch b/media-tv/kodi/files/kodi-19.4-dav1d-1.0.0.patch deleted file mode 100644 index b37ace0f31ec..000000000000 --- a/media-tv/kodi/files/kodi-19.4-dav1d-1.0.0.patch +++ /dev/null @@ -1,94 +0,0 @@ -diff -Nur a/cmake/modules/FindFFMPEG.cmake b/cmake/modules/FindFFMPEG.cmake ---- a/cmake/modules/FindFFMPEG.cmake 2022-03-02 18:38:51.000000000 +0000 -+++ b/cmake/modules/FindFFMPEG.cmake 2022-11-22 19:15:38.690434650 +0000 -@@ -275,6 +275,8 @@ - PATCH_COMMAND ${CMAKE_COMMAND} -E copy - ${CMAKE_SOURCE_DIR}/tools/depends/target/ffmpeg/CMakeLists.txt - <SOURCE_DIR> && -+ # patch internal ffmpeg, fix build against dav1d 1.0.0 -+ patch -p1 < ${CMAKE_SOURCE_DIR}/tools/depends/target/ffmpeg/build-fix-for-dav1d-1.0.0.patch && - ${CMAKE_COMMAND} -E copy - ${CMAKE_SOURCE_DIR}/tools/depends/target/ffmpeg/FindGnuTls.cmake - <SOURCE_DIR>) -diff -Nur a/tools/depends/target/ffmpeg/build-fix-for-dav1d-1.0.0.patch b/tools/depends/target/ffmpeg/build-fix-for-dav1d-1.0.0.patch ---- a/tools/depends/target/ffmpeg/build-fix-for-dav1d-1.0.0.patch 1970-01-01 01:00:00.000000000 +0100 -+++ b/tools/depends/target/ffmpeg/build-fix-for-dav1d-1.0.0.patch 2022-11-22 19:12:09.566420470 +0000 -@@ -0,0 +1,78 @@ -+From 2546e1ed27f92a840a2cf319e3c1833799974cf1 Mon Sep 17 00:00:00 2001 -+From: BlackEagle <ike.devolder@gmail.com> -+Date: Fri, 29 Apr 2022 14:33:12 +0200 -+Subject: [PATCH] add build fix for dav1d 1.0.0 -+ -+Taken from https://github.com/FFmpeg/FFmpeg/commit/e204846ec16c1ab34c7f3a681734cf5190433018 -+ -+add FF_DAV1D_VERSION_AT_LEAST -+ -+Extracted from https://github.com/FFmpeg/FFmpeg/commit/7ee17ec7e46afef0e0af20af196292ec75f50b62 -+ -+Signed-off-by: BlackEagle <ike.devolder@gmail.com> -+--- -+ libavcodec/libdav1d.c | 24 ++++++++++++++++++++++-- -+ 1 file changed, 22 insertions(+), 2 deletions(-) -+ -+diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c -+index bbb3ec1e6c..08b4af8ac8 100644 -+--- a/libavcodec/libdav1d.c -++++ b/libavcodec/libdav1d.c -+@@ -30,6 +30,9 @@ -+ #include "decode.h" -+ #include "internal.h" -+ -++#define FF_DAV1D_VERSION_AT_LEAST(x,y) \ -++ (DAV1D_API_VERSION_MAJOR > (x) || DAV1D_API_VERSION_MAJOR == (x) && DAV1D_API_VERSION_MINOR >= (y)) -++ -+ typedef struct Libdav1dContext { -+ AVClass *class; -+ Dav1dContext *c; -+@@ -140,6 +143,15 @@ static av_cold int libdav1d_init(AVCodecContext *c) -+ if (dav1d->operating_point >= 0) -+ s.operating_point = dav1d->operating_point; -+ -++#if FF_DAV1D_VERSION_AT_LEAST(6,0) -++ if (dav1d->frame_threads || dav1d->tile_threads) -++ s.n_threads = FFMAX(dav1d->frame_threads, dav1d->tile_threads); -++ else -++ s.n_threads = FFMIN(threads, DAV1D_MAX_THREADS); -++ s.max_frame_delay = (c->flags & AV_CODEC_FLAG_LOW_DELAY) ? 1 : s.n_threads; -++ av_log(c, AV_LOG_DEBUG, "Using %d threads, %d max_frame_delay\n", -++ s.n_threads, s.max_frame_delay); -++#else -+ s.n_tile_threads = dav1d->tile_threads -+ ? dav1d->tile_threads -+ : FFMIN(floor(sqrt(threads)), DAV1D_MAX_TILE_THREADS); -+@@ -148,6 +160,7 @@ static av_cold int libdav1d_init(AVCodecContext *c) -+ : FFMIN(ceil(threads / s.n_tile_threads), DAV1D_MAX_FRAME_THREADS); -+ av_log(c, AV_LOG_DEBUG, "Using %d frame threads, %d tile threads\n", -+ s.n_frame_threads, s.n_tile_threads); -++#endif -+ -+ res = dav1d_open(&dav1d->c, &s); -+ if (res < 0) -+@@ -384,11 +397,18 @@ static av_cold int libdav1d_close(AVCodecContext *c) -+ return 0; -+ } -+ -++#ifndef DAV1D_MAX_FRAME_THREADS -++#define DAV1D_MAX_FRAME_THREADS DAV1D_MAX_THREADS -++#endif -++#ifndef DAV1D_MAX_TILE_THREADS -++#define DAV1D_MAX_TILE_THREADS DAV1D_MAX_THREADS -++#endif -++ -+ #define OFFSET(x) offsetof(Libdav1dContext, x) -+ #define VD AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM -+ static const AVOption libdav1d_options[] = { -+- { "tilethreads", "Tile threads", OFFSET(tile_threads), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, DAV1D_MAX_TILE_THREADS, VD }, -+- { "framethreads", "Frame threads", OFFSET(frame_threads), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, DAV1D_MAX_FRAME_THREADS, VD }, -++ { "tilethreads", "Tile threads", OFFSET(tile_threads), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, DAV1D_MAX_TILE_THREADS, VD | AV_OPT_FLAG_DEPRECATED }, -++ { "framethreads", "Frame threads", OFFSET(frame_threads), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, DAV1D_MAX_FRAME_THREADS, VD | AV_OPT_FLAG_DEPRECATED }, -+ { "filmgrain", "Apply Film Grain", OFFSET(apply_grain), AV_OPT_TYPE_BOOL, { .i64 = -1 }, -1, 1, VD }, -+ { "oppoint", "Select an operating point of the scalable bitstream", OFFSET(operating_point), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 31, VD }, -+ { "alllayers", "Output all spatial layers", OFFSET(all_layers), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VD }, -+-- -+2.36.0 -+ diff --git a/media-tv/kodi/files/kodi-19.4-fix-mesa-22.3.0-build.patch b/media-tv/kodi/files/kodi-19.4-fix-mesa-22.3.0-build.patch deleted file mode 100644 index e9ff90dfe55d..000000000000 --- a/media-tv/kodi/files/kodi-19.4-fix-mesa-22.3.0-build.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- xbmc/xbmc/windowing/X11/GLContextEGL.h -+++ xbmc/xbmc/windowing/X11/GLContextEGL.h -@@ -13,7 +13,7 @@ - #include "threads/CriticalSection.h" - - #include <EGL/eglext.h> --#include <EGL/eglextchromium.h> -+#include <EGL/eglext_angle.h> - #include <X11/Xutil.h> - - class CGLContextEGL : public CGLContext - diff --git a/media-tv/kodi/files/kodi-19.5-flatbuffers.patch b/media-tv/kodi/files/kodi-19.5-flatbuffers.patch deleted file mode 100644 index 3e8f00c1449f..000000000000 --- a/media-tv/kodi/files/kodi-19.5-flatbuffers.patch +++ /dev/null @@ -1,35 +0,0 @@ -https://github.com/xbmc/xbmc/pull/23334 - -From 07d8c98a0a65e005b85ef70e06eb1b9bbe7f764c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Markus=20H=C3=A4rer?= <markus.haerer@gmx.net> -Date: Sun, 28 May 2023 00:49:40 +0200 -Subject: [PATCH] SavestateFlatBuffer: Remove forward declararion of - FlatBufferBuilder - -This caused a compiler error with recent faltbuffers because the type changed: - -In file included from xbmc/cores/RetroPlayer/savestates/SavestateDatabase.cpp:12: -xbmc/cores/RetroPlayer/savestates/SavestateFlatBuffer.h:19:7: error: definition of type 'FlatBufferBuilder' conflicts with type alias of the same name -class FlatBufferBuilder; - ^ -/usr/include/flatbuffers/flatbuffer_builder.h:1414:7: note: 'FlatBufferBuilder' declared here -using FlatBufferBuilder = FlatBufferBuilderImpl<false>; - ^ -1 error generated. - -(cherry picked from commit 351184d7e4e3edc447d04a297769eb41a477ba68) ---- a/xbmc/cores/RetroPlayer/savestates/SavestateFlatBuffer.h -+++ b/xbmc/cores/RetroPlayer/savestates/SavestateFlatBuffer.h -@@ -14,11 +14,6 @@ - - #include <flatbuffers/flatbuffers.h> - --namespace flatbuffers --{ --class FlatBufferBuilder; --} -- - namespace KODI - { - namespace RETRO - diff --git a/media-tv/kodi/files/kodi-19.5-gcc-13.patch b/media-tv/kodi/files/kodi-19.5-gcc-13.patch deleted file mode 100644 index 268ebc2737f7..000000000000 --- a/media-tv/kodi/files/kodi-19.5-gcc-13.patch +++ /dev/null @@ -1,70 +0,0 @@ -https://bugs.gentoo.org/892503 -https://github.com/xbmc/xbmc/pull/22627 -https://github.com/xbmc/xbmc/pull/22631 - -From 6730f62c5d709f8789e11d3f979c597fe702daa3 Mon Sep 17 00:00:00 2001 -From: Sam James <sam@gentoo.org> -Date: Sun, 29 Jan 2023 22:14:16 +0000 -Subject: [PATCH] windowing: X11: Add missing <cstdint> include (fix build with - GCC 13) - -GCC 13 (as usual for new compiler releases) shuffles around some -internal includes and so <cstdint> etc is no longer transitively included. - -See https://www.gnu.org/software/gcc/gcc-13/porting_to.html. - -Bug: https://bugs.gentoo.org/892503 ---- a/xbmc/windowing/X11/GLContext.h -+++ b/xbmc/windowing/X11/GLContext.h -@@ -8,6 +8,7 @@ - - #pragma once - -+#include <cstdint> - #include <string> - - #include <X11/Xlib.h> - ---- a/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h -+++ b/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h -@@ -12,6 +12,7 @@ - #include <lcms2.h> - #endif - -+#include <cstdint> - #include <string> - - extern "C" ---- a/xbmc/pictures/Picture.h -+++ b/xbmc/pictures/Picture.h -@@ -11,6 +11,8 @@ - #include "pictures/PictureScalingAlgorithm.h" - #include "utils/Job.h" - -+#include <cstddef> -+#include <cstdint> - #include <string> - #include <vector> - ---- a/xbmc/platform/Filesystem.h -+++ b/xbmc/platform/Filesystem.h -@@ -8,6 +8,7 @@ - - #pragma once - -+#include <cstdint> - #include <string> - #include <system_error> - namespace KODI -diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h -index 66d1bf0200..dcd60698d6 100644 ---- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h -+++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h -@@ -9,6 +9,7 @@ - #pragma once - - #include <array> -+#include <cstdint> - - #if defined(HAS_GL) - // always define GL_GLEXT_PROTOTYPES before include gl headers diff --git a/media-tv/kodi/files/kodi-20.2-binutils-2.41.patch b/media-tv/kodi/files/kodi-20.2-binutils-2.41.patch deleted file mode 100644 index 6ee7a55ee1de..000000000000 --- a/media-tv/kodi/files/kodi-20.2-binutils-2.41.patch +++ /dev/null @@ -1,103 +0,0 @@ -https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/effadce6c756247ea8bae32dc13bb3e6f464f0eb - -From db99a6e0ed9490478a7af7b6a3299688b1a329e1 Mon Sep 17 00:00:00 2001 -From: Alfred Wingate <parona@protonmail.com> -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 <parona@protonmail.com> ---- 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 -- <SOURCE_DIR>) -+ <SOURCE_DIR> && -+ # 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?= <remi@remlab.net> -+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 <jamrial@gmail.com> -+--- -+ 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-gcc-14.patch b/media-tv/kodi/files/kodi-20.3-gcc-14.patch deleted file mode 100644 index b4c5ee94eb80..000000000000 --- a/media-tv/kodi/files/kodi-20.3-gcc-14.patch +++ /dev/null @@ -1,72 +0,0 @@ -https://github.com/xbmc/xbmc/commit/3dcea03c915f2062d4f8740d66abdf033fba9d6c -https://bugs.gentoo.org/923041 - -From 3dcea03c915f2062d4f8740d66abdf033fba9d6c Mon Sep 17 00:00:00 2001 -From: Manuel Lauss <manuel.lauss@gmail.com> -Date: Fri, 13 Oct 2023 12:27:15 +0200 -Subject: [PATCH] add missing c++ headers - -Add a few missing headers which are no longer indirectly included by -other headers, fixes build with gcc-14 ---- a/xbmc/addons/AddonUpdateRules.cpp -+++ b/xbmc/addons/AddonUpdateRules.cpp -@@ -12,6 +12,7 @@ - #include "addons/addoninfo/AddonInfo.h" - #include "utils/log.h" - -+#include <algorithm> - #include <mutex> - - using namespace ADDON; ---- a/xbmc/addons/binary-addons/AddonDll.cpp -+++ b/xbmc/addons/binary-addons/AddonDll.cpp -@@ -27,6 +27,7 @@ - #include "utils/Variant.h" - #include "utils/log.h" - -+#include <algorithm> - #include <utility> - - using namespace KODI::MESSAGING; ---- a/xbmc/interfaces/json-rpc/TextureOperations.cpp -+++ b/xbmc/interfaces/json-rpc/TextureOperations.cpp -@@ -14,6 +14,8 @@ - #include "TextureDatabase.h" - #include "utils/Variant.h" - -+#include <algorithm> -+ - using namespace JSONRPC; - - JSONRPC_STATUS CTextureOperations::GetTextures(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant ¶meterObject, CVariant &result) ---- a/xbmc/utils/EGLImage.cpp -+++ b/xbmc/utils/EGLImage.cpp -@@ -14,6 +14,7 @@ - #include "utils/StringUtils.h" - #include "utils/log.h" - -+#include <algorithm> - #include <map> - - namespace ---- a/xbmc/windowing/gbm/drm/DRMConnector.cpp -+++ b/xbmc/windowing/gbm/drm/DRMConnector.cpp -@@ -11,6 +11,7 @@ - #include "utils/XTimeUtils.h" - #include "utils/log.h" - -+#include <algorithm> - #include <map> - - using namespace KODI::WINDOWING::GBM; ---- a/xbmc/windowing/gbm/drm/DRMPlane.cpp -+++ b/xbmc/windowing/gbm/drm/DRMPlane.cpp -@@ -13,6 +13,8 @@ - #include "utils/StringUtils.h" - #include "utils/log.h" - -+#include <algorithm> -+ - using namespace KODI::WINDOWING::GBM; - - CDRMPlane::CDRMPlane(int fd, uint32_t plane) : CDRMObject(fd), m_plane(drmModeGetPlane(m_fd, plane)) diff --git a/media-tv/kodi/files/kodi-21-fix-dvd-playing.patch b/media-tv/kodi/files/kodi-21-fix-dvd-playing.patch deleted file mode 100644 index febcdc2197e4..000000000000 --- a/media-tv/kodi/files/kodi-21-fix-dvd-playing.patch +++ /dev/null @@ -1,50 +0,0 @@ -https://bugs.gentoo.org/933370 -https://github.com/xbmc/xbmc/issues/24955 -https://github.com/xbmc/xbmc/pull/24968 - -From e8493d3ac390bac4ca74fa5435bb258d6764dae5 Mon Sep 17 00:00:00 2001 -From: Jose Luis Marti <joseluis.marti@gmail.com> -Date: Tue, 9 Apr 2024 23:06:10 +0200 -Subject: [PATCH] [DllLoader] Remove fstatvfs64 wrapper - -Co-authored-by: fuzzard <fuzzard@users.noreply.github.com> ---- a/xbmc/cores/DllLoader/exports/wrapper.c -+++ b/xbmc/cores/DllLoader/exports/wrapper.c -@@ -36,7 +36,6 @@ typedef fpos_t fpos64_t; - #endif - - struct mntent; --struct statvfs64; - - void* dllmalloc(size_t ); - void* dllcalloc( size_t , size_t ); -@@ -92,7 +91,6 @@ int dll_ftrylockfile(FILE *file); - void dll_funlockfile(FILE *file); - int dll_fstat64(int fd, struct stat64 *buf); - int dll_fstat(int fd, struct _stat *buf); --int dll_fstatvfs64(int fildes, struct statvfs64 *buf); - FILE* dll_popen(const char *command, const char *mode); - void* dll_dlopen(const char *filename, int flag); - int dll_setvbuf(FILE *stream, char *buf, int type, size_t size); -@@ -445,11 +443,6 @@ int __wrap_fstat64(int fd, struct stat64* buf) - return dll_fstat64(fd, buf); - } - --int __wrap_fstatvfs64(int fd, struct statvfs64* buf) --{ -- return dll_fstatvfs64(fd, buf); --} -- - int __wrap_setvbuf(FILE *stream, char *buf, int type, size_t size) - { - return dll_setvbuf(stream, buf, type, size); ---- a/xbmc/cores/DllLoader/exports/wrapper_mach_alias -+++ b/xbmc/cores/DllLoader/exports/wrapper_mach_alias -@@ -20,7 +20,6 @@ ___wrap_fread _fread - ___wrap_freopen _freopen - ___wrap_fseek _fseek - ___wrap_fsetpos _fsetpos --___wrap_fstatvfs64 _fstatvfs64 - ___wrap_ftell _ftell - ___wrap_ftrylockfile _ftrylockfile - ___wrap_funlockfile _funlockfile diff --git a/media-tv/kodi/files/kodi-21-fix-gcc14.patch b/media-tv/kodi/files/kodi-21-fix-gcc14.patch deleted file mode 100644 index fdfa36723f1f..000000000000 --- a/media-tv/kodi/files/kodi-21-fix-gcc14.patch +++ /dev/null @@ -1,42 +0,0 @@ -https://github.com/xbmc/xbmc/pull/25106 - -From 2bf5ab07731b3d4160196e6b8d9ab9e25bea2ef9 Mon Sep 17 00:00:00 2001 -From: Rudi Heitbaum <rudi@heitbaum.com> -Date: Thu, 2 May 2024 08:02:42 +0000 -Subject: [PATCH 1/2] add missing c++ headers - -Add missing headers which are no longer indirectly included by -other headers, fixes build with gcc-14 - -Signed-off-by: Rudi Heitbaum <rudi@heitbaum.com> ---- a/xbmc/platform/posix/filesystem/SMBWSDiscoveryListener.cpp -+++ b/xbmc/platform/posix/filesystem/SMBWSDiscoveryListener.cpp -@@ -17,6 +17,7 @@ - - #include "platform/posix/filesystem/SMBWSDiscovery.h" - -+#include <algorithm> - #include <array> - #include <chrono> - #include <mutex> - -From b6ddd8fb25ef20e8adb9a9f9b53bebf0cee3a970 Mon Sep 17 00:00:00 2001 -From: Rudi Heitbaum <rudi@heitbaum.com> -Date: Thu, 2 May 2024 08:05:00 +0000 -Subject: [PATCH 2/2] Geometry: fix template-id not allowed for constructor - -fixes gcc-14 error: -- warning: template-id not allowed for constructor in C++20 - -Signed-off-by: Rudi Heitbaum <rudi@heitbaum.com> ---- a/xbmc/utils/Geometry.h -+++ b/xbmc/utils/Geometry.h -@@ -177,7 +177,7 @@ template <typename T> class CSizeGen - return {m_w, m_h}; - } - -- template<class U> explicit CSizeGen<T>(const CSizeGen<U>& rhs) -+ template<class U> explicit CSizeGen(const CSizeGen<U>& rhs) - { - CheckSet(static_cast<T> (rhs.m_w), static_cast<T> (rhs.m_h)); - } diff --git a/media-tv/kodi/files/kodi-21-optional-ffmpeg-libx11.patch b/media-tv/kodi/files/kodi-21-optional-ffmpeg-libx11.patch new file mode 100644 index 000000000000..1d0805a3e574 --- /dev/null +++ b/media-tv/kodi/files/kodi-21-optional-ffmpeg-libx11.patch @@ -0,0 +1,14 @@ +--- a/tools/depends/target/ffmpeg/CMakeLists.txt ++++ b/tools/depends/target/ffmpeg/CMakeLists.txt +@@ -74,6 +74,11 @@ if(CORE_SYSTEM_NAME STREQUAL linux OR CORE_SYSTEM_NAME STREQUAL freebsd) + else() + list(APPEND ffmpeg_conf --disable-vdpau) + endif() ++ if ("x11" IN_LIST CORE_PLATFORM_NAME_LC) ++ list(APPEND ffmpeg_conf --enable-xlib) ++ else() ++ list(APPEND ffmpeg_conf --disable-xlib) ++ endif() + elseif(CORE_SYSTEM_NAME STREQUAL android) + list(APPEND ffmpeg_conf --target-os=android + --extra-libs=-liconv diff --git a/media-tv/kodi/files/kodi-21.1-fix-gcc15.patch b/media-tv/kodi/files/kodi-21.1-fix-gcc15.patch new file mode 100644 index 000000000000..5ab776e70f50 --- /dev/null +++ b/media-tv/kodi/files/kodi-21.1-fix-gcc15.patch @@ -0,0 +1,116 @@ +https://bugs.gentoo.org/938531 +https://github.com/xbmc/xbmc/pull/25735 + +From 75e7b25883af5d2c8c89dbe6d830a5c17e9452f2 Mon Sep 17 00:00:00 2001 +From: Alfred Wingate <parona@protonmail.com> +Date: Sat, 14 Sep 2024 13:46:25 +0300 +Subject: [PATCH] Include missing <cstdint> includes + +* GCC-15 stopped implicitly including it. + +Signed-off-by: Alfred Wingate <parona@protonmail.com> +--- a/xbmc/ContextMenuItem.h ++++ b/xbmc/ContextMenuItem.h +@@ -8,6 +8,7 @@ + + #pragma once + ++#include <cstdint> + #include <map> + #include <memory> + #include <string> +--- a/xbmc/addons/AddonManager.h ++++ b/xbmc/addons/AddonManager.h +@@ -11,6 +11,7 @@ + #include "threads/CriticalSection.h" + #include "utils/EventStream.h" + ++#include <cstdint> + #include <map> + #include <memory> + #include <mutex> +--- a/xbmc/addons/IAddon.h ++++ b/xbmc/addons/IAddon.h +@@ -8,6 +8,7 @@ + + #pragma once + ++#include <cstdint> + #include <map> + #include <memory> + #include <string> +--- a/xbmc/cores/RetroPlayer/streams/RetroPlayerVideo.h ++++ b/xbmc/cores/RetroPlayer/streams/RetroPlayerVideo.h +@@ -11,6 +11,8 @@ + #include "IRetroPlayerStream.h" + #include "cores/RetroPlayer/RetroPlayerTypes.h" + ++#include <cstdint> ++ + extern "C" + { + #include <libavutil/pixfmt.h> +--- a/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/ConversionMatrix.h ++++ b/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/ConversionMatrix.h +@@ -10,6 +10,7 @@ + + #include <array> + #include <cmath> ++#include <cstdint> + #include <memory> + + extern "C" { +--- a/xbmc/guilib/FFmpegImage.h ++++ b/xbmc/guilib/FFmpegImage.h +@@ -9,6 +9,8 @@ + #pragma once + + #include "iimage.h" ++ ++#include <cstdint> + #include <memory> + + extern "C" +--- a/xbmc/input/keymaps/remote/IRTranslator.h ++++ b/xbmc/input/keymaps/remote/IRTranslator.h +@@ -8,6 +8,7 @@ + + #pragma once + ++#include <cstdint> + #include <map> + #include <memory> + #include <string> +--- a/xbmc/messaging/ThreadMessage.h ++++ b/xbmc/messaging/ThreadMessage.h +@@ -8,6 +8,7 @@ + + #pragma once + ++#include <cstdint> + #include <memory> + #include <string> + #include <utility> +--- a/xbmc/settings/AdvancedSettings.h ++++ b/xbmc/settings/AdvancedSettings.h +@@ -13,6 +13,7 @@ + #include "settings/lib/ISettingsHandler.h" + #include "utils/SortUtils.h" + ++#include <cstdint> + #include <set> + #include <string> + #include <utility> +--- a/xbmc/utils/Archive.h ++++ b/xbmc/utils/Archive.h +@@ -8,6 +8,7 @@ + + #pragma once + ++#include <cstdint> + #include <cstring> + #include <memory> + #include <string> +-- +2.46.0 + diff --git a/media-tv/kodi/files/kodi-21.1-silence-libdvdread-git.patch b/media-tv/kodi/files/kodi-21.1-silence-libdvdread-git.patch new file mode 100644 index 000000000000..83190d91e1db --- /dev/null +++ b/media-tv/kodi/files/kodi-21.1-silence-libdvdread-git.patch @@ -0,0 +1,36 @@ +From a193fae2ace4aa9086f9b73fa7008a016c30061e Mon Sep 17 00:00:00 2001 +From: Alfred Wingate <parona@protonmail.com> +Date: Wed, 21 Aug 2024 13:40:02 +0300 +Subject: [PATCH] Silence git "command not found" + +--- a/cmake/modules/FindLibDvdRead.cmake ++++ b/cmake/modules/FindLibDvdRead.cmake +@@ -39,6 +39,9 @@ if(NOT TARGET LibDvdRead::LibDvdRead) + + set(LIBDVDREAD_VERSION ${${MODULE}_VER}) + ++ set(patches "${CORE_SOURCE_DIR}/tools/depends/target/${MODULE_LC}/silence-git.patch") ++ generate_patchcommand("${patches}") ++ + set(HOST_ARCH ${ARCH}) + if(CORE_SYSTEM_NAME STREQUAL android) + if(ARCH STREQUAL arm) +--- /dev/null ++++ b/tools/depends/target/libdvdread/silence-git.patch +@@ -0,0 +1,13 @@ ++diff --git a/Makefile.am b/Makefile.am ++index f2849b8..7cee887 100644 ++--- a/Makefile.am +++++ b/Makefile.am ++@@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = -Im4 ++ ++ AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src/dvdread $(CSS_CFLAGS) ++ ++-dist_doc_DATA = AUTHORS ChangeLog COPYING NEWS README.md TODO +++dist_doc_DATA = AUTHORS COPYING NEWS README.md TODO ++ ++ MAINTAINERCLEANFILES = ChangeLog ++ +-- +2.46.0 + diff --git a/media-tv/kodi/kodi-19.5-r2.ebuild b/media-tv/kodi/kodi-19.5-r2.ebuild deleted file mode 100644 index 7b7a084a897d..000000000000 --- a/media-tv/kodi/kodi-19.5-r2.ebuild +++ /dev/null @@ -1,382 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_REQ_USE="sqlite,ssl" -LIBDVDCSS_VERSION="1.4.2-Leia-Beta-5" -LIBDVDREAD_VERSION="6.0.0-Leia-Alpha-3" -LIBDVDNAV_VERSION="6.0.0-Leia-Alpha-3" -FFMPEG_VERSION="4.3.2" -CODENAME="Matrix" -FFMPEG_KODI_VERSION="19.1" -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}-${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="Matrix" - inherit git-r3 -else - MY_PV=${PV/_p/_r} - MY_PV=${MY_PV/_alpha/a} - MY_PV=${MY_PV/_beta/b} - MY_PV=${MY_PV/_rc/RC} - 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" - 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 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" -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - || ( gbm wayland X ) - ?? ( mariadb mysql ) - bluray? ( udf ) - udev? ( !libusb ) - udisks? ( dbus ) - upower? ( dbus ) - power-control? ( dbus ) - vdpau? ( - X - !gles - !gbm - ) - zeroconf? ( dbus ) -" -RESTRICT="!test? ( test )" - -COMMON_DEPEND=" - >=dev-libs/lzo-2.04 - >=dev-libs/flatbuffers-1.12.0:= - >=media-libs/libjpeg-turbo-2.0.4:= - >=media-libs/libpng-1.6.26:0= -" -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 - <dev-libs/crossguid-0.2.2_p20190529 - >=dev-libs/fribidi-1.0.5 - cec? ( >=dev-libs/libcec-4.0 ) - dev-libs/libpcre[cxx] - >=dev-libs/spdlog-1.5.0:= - dev-libs/tinyxml[stl] - $(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 - gbm? ( - >=dev-libs/libinput-1.10.5 - media-libs/mesa[gbm(+)] - x11-libs/libxkbcommon - ) - gles? ( - !raspberry-pi? ( - || ( - >=media-libs/mesa-24.1.0_rc1[opengl] - <media-libs/mesa-24.1.0_rc1[gles2] - ) - ) - ) - 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-${FFMPEG_VERSION}:=[dav1d?,encode,postproc] - =media-video/ffmpeg-4*[openssl] - ) - !system-ffmpeg? ( - app-arch/bzip2 - 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-24.1.0_rc1[opengl,video_cards_vc4] - <media-libs/mesa-24.1.0_rc1[egl(+),gles2,video_cards_vc4] - ) - ) - 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] ) - ) - virtual/libiconv - vdpau? ( - || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) - system-ffmpeg? ( media-video/ffmpeg[vdpau] ) - ) - wayland? ( - >=dev-cpp/waylandpp-0.2.3:= - media-libs/mesa[wayland] - >=dev-libs/wayland-protocols-1.7 - >=x11-libs/libxkbcommon-0.4.1 - ) - webserver? ( >=net-libs/libmicrohttpd-0.9.55:=[messages(+)] ) - X? ( - media-libs/mesa[X] - !gles? ( media-libs/libglvnd[X] ) - x11-libs/libX11 - 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] ) -" -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 ) -" -DEPEND="${COMMON_DEPEND} ${COMMON_TARGET_DEPEND} - dev-libs/rapidjson - test? ( >=dev-cpp/gtest-1.10.0 ) -" -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 -" - -CONFIG_CHECK="~IP_MULTICAST" -ERROR_IP_MULTICAST=" -In some cases Kodi needs to access multicast addresses. -Please consider enabling IP_MULTICAST under Networking options. -" - -PATCHES=( - "${FILESDIR}/${PN}-19.4-atomic.patch" - "${FILESDIR}/${PN}-19.4-dav1d-1.0.0.patch" - "${FILESDIR}/${PN}-19.5-gcc-13.patch" - "${FILESDIR}/${PN}-19.5-flatbuffers.patch" -) - -pkg_setup() { - check_extra_config - python-single-r1_pkg_setup -} - -src_unpack() { - if [[ ${PV} == *9999 ]] ; then - git-r3_src_unpack - else - default - fi -} - -src_prepare() { - # https://bugs.gentoo.org/885419 - if has_version ">=media-libs/mesa-22.3.0"; then - PATCHES+=( "${FILESDIR}/${PN}-19.4-fix-mesa-22.3.0-build.patch" ) - fi - - cmake_src_prepare - - # avoid long delays when powerkit isn't running #348580 - sed -i \ - -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 - 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=( - -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) - -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" - -DVERBOSE=ON - -DENABLE_LDGOLD=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) - -DENABLE_CCACHE=OFF - -DENABLE_CLANGFORMAT=OFF - -DENABLE_CLANGTIDY=OFF - -DENABLE_CPPCHECK=OFF - -DENABLE_ISO9660PP=$(usex optical) - -DENABLE_CEC=$(usex cec) - -DENABLE_DBUS=$(usex dbus) - -DENABLE_DVDCSS=$(usex css) - -DENABLE_EVENTCLIENTS=ON # alway 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_LCMS2=$(usex lcms) - -DENABLE_LIRCCLIENT=$(usex lirc) - -DENABLE_MARIADBCLIENT=$(usex mariadb) - -DENABLE_MDNS=OFF # used only on Android - -DENABLE_MICROHTTPD=$(usex webserver) - -DENABLE_MYSQLCLIENT=$(usex mysql) - -DENABLE_NFS=$(usex nfs) - -DENABLE_OPENGLES=$(usex gles) - -DENABLE_OPENGL=$(usex !gles) - -DENABLE_OPTICAL=$(usex optical) - -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" - -Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_VERSION}.tar.gz" - -Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_VERSION}.tar.gz" - -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" - -DPYTHON_LIBRARY="$(python_get_library_path)" - -DAPP_RENDER_SYSTEM="$(usex gles gles gl)" - -DCORE_PLATFORM_NAME="${core_platform_name}" - ) - - 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}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz" ) - 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 - - cmake_src_configure -} - -src_compile() { - cmake_src_compile all -} - -src_test() { - local myctestargs=( - # Known failing, unreliable test - # bug #743938 - -E "(TestCPUInfo.GetCPUFrequency)" - ) - - # see https://github.com/xbmc/xbmc/issues/17860#issuecomment-630120213 - KODI_HOME="${BUILD_DIR}" cmake_build check -} - -src_install() { - cmake_src_install - - pax-mark Em "${ED}"/usr/$(get_libdir)/${PN}/${PN}.bin - - newicon media/icon48x48.png kodi.png - - rm "${ED}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die - dosym ../../../../fonts/roboto/Roboto-Thin.ttf \ - usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf - - if use !eventclients ; then - rm -f "${ED}"/usr/bin/kodi-ps3remote || die - rm -f "${D}"$(python_get_sitedir)/kodi/ps3_remote.py || die - rm -rf "${D}"$(python_get_sitedir)/kodi/ps3 || die - rm -rf "${D}"$(python_get_sitedir)/kodi/bt || die - rm -rf "${ED}"/usr/share/doc/${PF}/kodi-eventclients-dev || die - fi - - python_optimize "${D}$(python_get_sitedir)" -} diff --git a/media-tv/kodi/kodi-20.5-r1.ebuild b/media-tv/kodi/kodi-20.5-r1.ebuild deleted file mode 100644 index a518af43864c..000000000000 --- a/media-tv/kodi/kodi-20.5-r1.ebuild +++ /dev/null @@ -1,479 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# 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/<project>/<project>-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="4.4.1" -CODENAME="Nexus" -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" - if [[ ${PV} != "9999" ]]; then - EGIT_BRANCH="${CODENAME}" - fi - inherit git-r3 -else - MY_PV=${PV/_p/_r} - MY_PV=${MY_PV/_alpha/a} - MY_PV=${MY_PV/_beta/b} - MY_PV=${MY_PV/_rc/RC} - 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" - S=${WORKDIR}/xbmc-${MY_PV} -fi - -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 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 ) - ?? ( mariadb mysql ) - bluray? ( udf ) - gbm? ( udev ) - udev? ( !libusb ) - vdpau? ( X !gles !gbm ) - zeroconf? ( dbus ) -" -RESTRICT="!test? ( test )" - -# dev-libs/libcec[-cubox] bug #818262 -COMMON_DEPEND=" - >=dev-libs/flatbuffers-1.12.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} - >=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 - >=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}] - ') - 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] - ) - dbus? ( - sys-apps/dbus - ) - gbm? ( - >=dev-libs/libinput-1.10.5:= - x11-libs/libxkbcommon - ) - gles? ( - !raspberry-pi? ( - || ( - >=media-libs/mesa-24.1.0_rc1[opengl] - <media-libs/mesa-24.1.0_rc1[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-24.1.0_rc1[opengl,video_cards_vc4] - <media-libs/mesa-24.1.0_rc1[egl(+),gles2,video_cards_vc4] - ) - ) - samba? ( - >=net-fs/samba-3.4.6[smbclient(+)] - ) - system-ffmpeg? ( - >=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,postproc,vaapi?,vdpau?,X?] - =media-video/ffmpeg-4*[openssl] - ) - !system-ffmpeg? ( - app-arch/bzip2 - media-libs/dav1d:= - ) - udf? ( - >=dev-libs/libudfread-1.0.0 - ) - udev? ( - virtual/libudev:= - ) - vaapi? ( - media-libs/libva:=[wayland?,X?] - ) - vdpau? ( - || ( - >=x11-libs/libvdpau-1.1 - >=x11-drivers/nvidia-drivers-180.51 - ) - ) - wayland? ( - >=x11-libs/libxkbcommon-0.4.1[wayland] - ) - webserver? ( - >=net-libs/libmicrohttpd-0.9.55:=[messages(+)] - ) - X? ( - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXrandr - ) - xslt? ( - dev-libs/libxslt - >=dev-libs/libxml2-2.9.4 - ) - zeroconf? ( - net-dns/avahi[dbus] - ) -" -RDEPEND=" - ${COMMON_DEPEND} - ${COMMON_TARGET_DEPEND} -" -DEPEND=" - ${COMMON_DEPEND} - ${COMMON_TARGET_DEPEND} - dev-libs/rapidjson - test? ( - >=dev-cpp/gtest-1.10.0 - ) - wayland? ( - >=dev-libs/wayland-protocols-1.7 - ) - X? ( - x11-base/xorg-proto - x11-libs/libXrender - ) -" -# <dev-lang/swig-4.2.0 https://github.com/xbmc/xbmc/issues/24385 -BDEPEND=" - ${COMMON_DEPEND} - dev-build/cmake - <dev-lang/swig-4.2.0 - virtual/pkgconfig - <=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. -Please consider enabling IP_MULTICAST under Networking options. -" - -PATCHES=( - "${FILESDIR}"/kodi-20.2-binutils-2.41.patch - "${FILESDIR}"/kodi-20.3-gcc-14.patch -) - -pkg_setup() { - check_extra_config - java-pkg-2_pkg_setup - python-single-r1_pkg_setup -} - -src_unpack() { - if [[ ${PV} == *9999 ]] ; then - git-r3_src_unpack - else - unpack ${MY_P}.tar.gz - fi -} - -src_prepare() { - cmake_src_prepare - - # avoid long delays when powerkit isn't running #348580 - sed -i \ - -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \ - xbmc/platform/linux/*.cpp || 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 -} - -src_configure() { - local mycmakeargs=( - -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 - - # 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_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 # 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) - -DENABLE_MDNS=OFF # used only on Android - -DENABLE_MICROHTTPD=$(usex webserver) - -DENABLE_MYSQLCLIENT=$(usex mysql) - -DENABLE_NFS=$(usex nfs) - -DENABLE_OPENGL=$(usex !gles) - -DENABLE_OPENGLES=$(usex gles) - -DENABLE_OPTICAL=$(usex optical) - -DENABLE_PIPEWIRE=$(usex pipewire) - -DENABLE_PLIST=$(usex airplay) - -DENABLE_PULSEAUDIO=$(usex pulseaudio) - -DENABLE_SMBCLIENT=$(usex samba) - -DENABLE_SNDIO=OFF - -DENABLE_UDEV=$(usex udev) - -DENABLE_UDFREAD=$(usex udf) - -DENABLE_UPNP=$(usex upnp) - -DENABLE_VAAPI=$(usex vaapi) - -DENABLE_VDPAU=$(usex vdpau) - -DENABLE_XSLT=$(usex xslt) - - #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" - -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 ) - - 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 - - # 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 -x CMAKE_SKIP_TESTS=( - # Known failing, unreliable test - # bug #743938 - 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 - 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 - - rm "${ED}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die - dosym ../../../../fonts/roboto/Roboto-Thin.ttf \ - usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf - - if use !eventclients ; then - rm -f "${ED}"/usr/bin/kodi-ps3remote || die - rm -f "${D}"$(python_get_sitedir)/kodi/ps3_remote.py || die - rm -rf "${D}"$(python_get_sitedir)/kodi/ps3 || die - rm -rf "${D}"$(python_get_sitedir)/kodi/bt || die - rm -rf "${ED}"/usr/share/doc/${PF}/kodi-eventclients-dev || die - 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 -} diff --git a/media-tv/kodi/kodi-21.0-r2.ebuild b/media-tv/kodi/kodi-21.0-r2.ebuild deleted file mode 100644 index f975ad26a22a..000000000000 --- a/media-tv/kodi/kodi-21.0-r2.ebuild +++ /dev/null @@ -1,516 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -CODENAME="Omega" - -# libdvd{css,read,nav} are not unbundlable without patching the buildsystem. - -# Versions for the forked projects that are bundled -# See tools/depends/target/<project>/<project>-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="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" - -# 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..12} ) - -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 - -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 - https://mirrors.kodi.tv/build-deps/sources/apache-groovy-binary-${GROOVY_VERSION}.zip - https://mirrors.kodi.tv/build-deps/sources/commons-lang3-${APACHE_COMMON_LANG_VERSION}-bin.tar.gz - https://mirrors.kodi.tv/build-deps/sources/commons-text-${APACHE_COMMON_TEXT_VERSION}-bin.tar.gz - css? ( - https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz - -> libdvdcss-${LIBDVDCSS_VERSION}.tar.gz - ) - !system-ffmpeg? ( - https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.gz - ) -" -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/xbmc/xbmc.git" - if [[ ${PV} != "9999" ]]; then - EGIT_BRANCH="${CODENAME}" - fi - inherit git-r3 -else - MY_PV=${PV/_p/_r} - MY_PV=${MY_PV/_alpha/a} - MY_PV=${MY_PV/_beta/b} - MY_PV=${MY_PV/_rc/rc} - 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 ~arm64 ~riscv ~x86" - S=${WORKDIR}/xbmc-${MY_PV} -fi - -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 dbus doc eventclients gbm gles lcms libusb lirc mariadb mysql nfs +optical pipewire pulseaudio samba soc +system-ffmpeg test udf udev upnp vaapi vdpau wayland webserver X +xslt zeroconf ${CPU_FLAGS}" -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - ^^ ( gbm wayland X ) - ?? ( mariadb mysql ) - bluray? ( udf ) - gbm? ( udev ) - soc? ( system-ffmpeg ) - udev? ( !libusb ) - vdpau? ( X !gles !gbm ) - zeroconf? ( dbus ) -" -RESTRICT="!test? ( test )" - -# dev-libs/libcec[-cubox] bug #818262 -COMMON_DEPEND=" - >=dev-libs/flatbuffers-23.3.3:= - >=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} - >=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 - >=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] - dev-libs/tinyxml2:= - media-fonts/roboto - media-libs/libglvnd[X?] - >=media-libs/freetype-2.10.1 - media-libs/harfbuzz:= - >=media-libs/libass-0.15.0:= - media-libs/mesa[egl(+),gbm(+)?,wayland?,X?] - >=media-libs/taglib-1.9.0 - =media-video/ffmpeg-6*:=[encode,soc(-)?,postproc,vaapi?,vdpau?,X?] - 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}] - ') - 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] - ) - dbus? ( - sys-apps/dbus - ) - gbm? ( - >=dev-libs/libinput-1.10.5:= - media-libs/libdisplay-info - x11-libs/libxkbcommon - ) - gles? ( - || ( - >=media-libs/mesa-24.1.0_rc1[opengl] - <media-libs/mesa-24.1.0_rc1[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.50:= - ) - pulseaudio? ( - media-libs/libpulse - ) - samba? ( - >=net-fs/samba-3.4.6[smbclient(+)] - ) - udf? ( - >=dev-libs/libudfread-1.0.0 - ) - udev? ( - virtual/libudev:= - ) - vaapi? ( - media-libs/libva:=[wayland?,X?] - ) - vdpau? ( - || ( - >=x11-libs/libvdpau-1.1 - >=x11-drivers/nvidia-drivers-180.51 - ) - ) - wayland? ( - >=x11-libs/libxkbcommon-0.4.1[wayland] - ) - webserver? ( - >=net-libs/libmicrohttpd-0.9.77:=[messages(+)] - ) - X? ( - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXrandr - ) - xslt? ( - dev-libs/libxslt - >=dev-libs/libxml2-2.9.4 - ) - zeroconf? ( - net-dns/avahi[dbus] - ) -" -RDEPEND=" - ${COMMON_DEPEND} - ${COMMON_TARGET_DEPEND} -" -DEPEND=" - ${COMMON_DEPEND} - ${COMMON_TARGET_DEPEND} - >=dev-libs/rapidjson-1.0.2 - 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} - app-arch/unzip - dev-build/cmake - dev-lang/swig - virtual/pkgconfig - <=virtual/jre-17:* - doc? ( - app-text/doxygen - ) -" - -PATCHES=( - "${FILESDIR}"/kodi-21-fix-gcc14.patch - "${FILESDIR}"/kodi-21-fix-dvd-playing.patch -) - -# bug #544020 -CONFIG_CHECK="~IP_MULTICAST" -ERROR_IP_MULTICAST=" -In some cases Kodi needs to access multicast addresses. -Please consider enabling IP_MULTICAST under Networking options. -" - -pkg_setup() { - check_extra_config - java-pkg-2_pkg_setup - python-single-r1_pkg_setup -} - -src_unpack() { - if [[ ${PV} == *9999 ]] ; then - git-r3_src_unpack - else - unpack ${MY_P}.tar.gz - fi - - unpack apache-groovy-binary-${GROOVY_VERSION}.zip - unpack commons-lang3-${APACHE_COMMON_LANG_VERSION}-bin.tar.gz - unpack commons-text-${APACHE_COMMON_TEXT_VERSION}-bin.tar.gz -} - -src_prepare() { - cmake_src_prepare - - # avoid long delays when powerkit isn't running #348580 - sed -i \ - -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \ - xbmc/platform/linux/*.cpp || 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 - - if tc-is-cross-compiler; then - # These tools are automatically built with CMake during a native build - # but need to be built in advance using Autotools for a cross build. - NATIVE_TOOLS=( - TexturePacker - JsonSchemaBuilder - ) - - local t - for t in "${NATIVE_TOOLS[@]}" ; do - pushd "${S}/tools/depends/native/$t/src" >/dev/null || die - AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" eautoreconf - popd >/dev/null || die - done - elibtoolize - fi -} - -src_configure() { - local mycmakeargs=( - -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 - - # 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_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 # 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) - -DENABLE_MDNS=OFF # used only on Android - -DENABLE_MICROHTTPD=$(usex webserver) - -DENABLE_MYSQLCLIENT=$(usex mysql) - -DENABLE_NFS=$(usex nfs) - -DENABLE_OPENGL=$(usex !gles) - -DENABLE_OPENGLES=$(usex gles) - -DENABLE_OPTICAL=$(usex optical) - -DENABLE_PIPEWIRE=$(usex pipewire) - -DENABLE_PLIST=$(usex airplay) - -DENABLE_PULSEAUDIO=$(usex pulseaudio) - -DENABLE_SMBCLIENT=$(usex samba) - -DENABLE_SNDIO=OFF - -DENABLE_UDEV=$(usex udev) - -DENABLE_UDFREAD=$(usex udf) - -DENABLE_UPNP=$(usex upnp) - -DENABLE_VAAPI=$(usex vaapi) - -DENABLE_VDPAU=$(usex vdpau) - -DENABLE_XSLT=$(usex xslt) - - -DWITH_FFMPEG=$(usex system-ffmpeg) - - #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 - - -DTARBALL_DIR="${DISTDIR}" - -Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_VERSION}.tar.gz" - -Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_VERSION}.tar.gz" - -Dgroovy_SOURCE_DIR="${WORKDIR}/groovy-${GROOVY_VERSION}" - -Dapache-commons-lang_SOURCE_DIR="${WORKDIR}/commons-lang3-${APACHE_COMMON_LANG_VERSION}" - -Dapache-commons-text_SOURCE_DIR="${WORKDIR}/commons-text-${APACHE_COMMON_TEXT_VERSION}" - ) - - # Separated to avoid "Manually-specified variables were not used by the project:" - use cec && mycmakeargs+=( -DENABLE_INTERNAL_CEC=OFF ) - use css && mycmakeargs+=( -Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_VERSION}.tar.gz" ) - use nfs && mycmakeargs+=( -DENABLE_INTERNAL_NFS=OFF ) - use !system-ffmpeg && mycmakeargs+=( - -DFFMPEG_URL="${DISTDIR}/ffmpeg-${FFMPEG_VERSION}.tar.gz" - ) - use !udev && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) ) - use X && use !gles && mycmakeargs+=( -DENABLE_GLX=ON ) - - 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 - - # Violates ODR (bug #860984) and USE_LTO does spooky stuff - # https://github.com/xbmc/xbmc/commit/cb72a22d54a91845b1092c295f84eeb48328921e - filter-lto - - if tc-is-cross-compiler; then - for t in "${NATIVE_TOOLS[@]}" ; do - pushd "${S}/tools/depends/native/$t/src" >/dev/null || die - econf_build - install -m0755 /dev/null "$t" || die # Actually build later. - mycmakeargs+=( -DWITH_${t^^}="${PWD}/$t" ) - popd >/dev/null || die - done - fi - - cmake_src_configure -} - -src_compile() { - if tc-is-cross-compiler; then - for t in "${NATIVE_TOOLS[@]}" ; do - emake -C "${S}/tools/depends/native/$t/src" - done - fi - - cmake_src_compile all - use doc && cmake_build doc - use test && cmake_build kodi-test -} - -src_test() { - local -x CMAKE_SKIP_TESTS=( - # Known failing, unreliable test - # bug #743938 - 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) - # Tries to ping localhost, naturally breaking network-sandbox - TestNetwork.PingHost - ) - - # see https://github.com/xbmc/xbmc/issues/17860#issuecomment-630120213 - 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 - - rm "${ED}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die - dosym ../../../../fonts/roboto/Roboto-Thin.ttf \ - usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf - - if use !eventclients ; then - rm -f "${ED}"/usr/bin/kodi-ps3remote || die - rm -f "${D}"$(python_get_sitedir)/kodi/ps3_remote.py || die - rm -rf "${D}"$(python_get_sitedir)/kodi/ps3 || die - rm -rf "${D}"$(python_get_sitedir)/kodi/bt || die - rm -rf "${ED}"/usr/share/doc/${PF}/kodi-eventclients-dev || die - 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 -} diff --git a/media-tv/kodi/kodi-21.0-r1.ebuild b/media-tv/kodi/kodi-21.1.ebuild index f1dbbd2a7b53..40695f070a1a 100644 --- a/media-tv/kodi/kodi-21.0-r1.ebuild +++ b/media-tv/kodi/kodi-21.1.ebuild @@ -19,16 +19,16 @@ GROOVY_VERSION="4.0.16" APACHE_COMMON_LANG_VERSION="3.14.0" APACHE_COMMON_TEXT_VERSION="1.11.0" -# Doesn't build with jdk-21 -_JAVA_PKG_WANT_BUILD_VM=( {openjdk{,-jre},icedtea}{,-bin}-{8,11,17} ) +_JAVA_PKG_WANT_BUILD_VM=( {openjdk{,-jre},icedtea}{,-bin}-{8,11,17,21} ) 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" +JAVA_PKG_WANT_SOURCE="21" +JAVA_PKG_WANT_TARGET="21" PYTHON_REQ_USE="sqlite,ssl" PYTHON_COMPAT=( python3_{10..12} ) +# 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 \ @@ -67,11 +67,19 @@ 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 arm64 ~riscv ~x86" + KEYWORDS="amd64 ~arm arm64 ~riscv ~x86" S=${WORKDIR}/xbmc-${MY_PV} fi LICENSE="GPL-2+" +# vendored dependencies +# apache-groovy, common-lang3 and commons-text +LICENSE+=" Apache-2.0" +# libdvdnav, libdvdread and libdvdcss. +LICENSE+=" GPL-2+" +# ffmpeg built as USE="gpl" +LICENSE+=" !system-ffmpeg? ( 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 @@ -79,7 +87,7 @@ SLOT="0" IUSE="airplay alsa bluetooth bluray caps cec +css dbus doc eventclients gbm gles lcms libusb lirc mariadb mysql nfs +optical pipewire pulseaudio samba soc +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 ) @@ -122,7 +130,6 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS} >=media-libs/libass-0.15.0:= media-libs/mesa[egl(+),gbm(+)?,wayland?,X?] >=media-libs/taglib-1.9.0 - =media-video/ffmpeg-6*:=[encode,soc(-)?,postproc,vaapi?,vdpau?,X?] sci-libs/kissfft virtual/libiconv virtual/ttf-fonts @@ -194,6 +201,15 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS} samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) + system-ffmpeg? ( + =media-video/ffmpeg-6*:=[encode,soc(-)?,postproc,vaapi?,vdpau?,X?] + ) + !system-ffmpeg? ( + app-arch/bzip2 + app-arch/xz-utils + media-libs/dav1d:= + net-libs/gnutls:= + ) udf? ( >=dev-libs/libudfread-1.0.0 ) @@ -253,14 +269,16 @@ BDEPEND=" dev-build/cmake dev-lang/swig virtual/pkgconfig - <=virtual/jre-17:* + <=virtual/jre-21:* doc? ( app-text/doxygen ) " PATCHES=( - "${FILESDIR}"/kodi-21-fix-gcc14.patch + "${FILESDIR}"/kodi-21-optional-ffmpeg-libx11.patch + "${FILESDIR}"/kodi-21.1-silence-libdvdread-git.patch + "${FILESDIR}"/kodi-21.1-fix-gcc15.patch ) # bug #544020 @@ -322,11 +340,17 @@ src_prepare() { } src_configure() { + local core_platform=( + $(usev gbm) + $(usev wayland) + $(usev X x11) + ) + local mycmakeargs=( -Wno-dev # less noise -DAPP_RENDER_SYSTEM=$(usex gles gles gl) - -DCORE_PLATFORM_NAME=$(usev gbm)$(usev wayland)$(usev X x11) + -DCORE_PLATFORM_NAME="${core_platform[*]}" -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" -DENABLE_TESTING=$(usex test) -DVERBOSE=ON @@ -357,7 +381,7 @@ src_configure() { -DENABLE_CEC=$(usex cec) -DENABLE_DBUS=$(usex dbus) -DENABLE_DVDCSS=$(usex css) - -DENABLE_EVENTCLIENTS=ON # alway enable to have 'kodi-send' and filter extra staff in 'src_install()' + -DENABLE_EVENTCLIENTS=ON # alway enable to have 'kodi-send' and filter extra stuff in 'src_install()' -DENABLE_ISO9660PP=$(usex optical) -DENABLE_LCMS2=$(usex lcms) -DENABLE_LIRCCLIENT=$(usex lirc) @@ -465,13 +489,20 @@ src_test() { # 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) # Tries to ping localhost, naturally breaking network-sandbox TestNetwork.PingHost ) + if use arm || use x86; then + # bug #779184 + # https://github.com/xbmc/xbmc/issues/18594 + CMAKE_SKIP_TESTS+=( + TestDateTime.Reset + TestDateTime.SetDateTime + TestDateTime.SetFromDBTime + ) + fi + # see https://github.com/xbmc/xbmc/issues/17860#issuecomment-630120213 local -x KODI_HOME="${BUILD_DIR}" diff --git a/media-tv/kodi/kodi-21.9999.ebuild b/media-tv/kodi/kodi-21.9999.ebuild index 7ca90c8d20dd..3e9e0d60425b 100644 --- a/media-tv/kodi/kodi-21.9999.ebuild +++ b/media-tv/kodi/kodi-21.9999.ebuild @@ -19,16 +19,16 @@ GROOVY_VERSION="4.0.16" APACHE_COMMON_LANG_VERSION="3.14.0" APACHE_COMMON_TEXT_VERSION="1.11.0" -# Doesn't build with jdk-21 -_JAVA_PKG_WANT_BUILD_VM=( {openjdk{,-jre},icedtea}{,-bin}-{8,11,17} ) +_JAVA_PKG_WANT_BUILD_VM=( {openjdk{,-jre},icedtea}{,-bin}-{8,11,17,21} ) 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" +JAVA_PKG_WANT_SOURCE="21" +JAVA_PKG_WANT_TARGET="21" PYTHON_REQ_USE="sqlite,ssl" PYTHON_COMPAT=( python3_{10..12} ) +# 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 \ @@ -67,11 +67,19 @@ 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 ~x86" + KEYWORDS="~amd64 ~arm64 ~riscv ~x86" S=${WORKDIR}/xbmc-${MY_PV} fi LICENSE="GPL-2+" +# vendored dependencies +# apache-groovy, common-lang3 and commons-text +LICENSE+=" Apache-2.0" +# libdvdnav, libdvdread and libdvdcss. +LICENSE+=" GPL-2+" +# ffmpeg built as USE="gpl" +LICENSE+=" !system-ffmpeg? ( 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 @@ -79,7 +87,7 @@ SLOT="0" IUSE="airplay alsa bluetooth bluray caps cec +css dbus doc eventclients gbm gles lcms libusb lirc mariadb mysql nfs +optical pipewire pulseaudio samba soc +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 ) @@ -122,7 +130,6 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS} >=media-libs/libass-0.15.0:= media-libs/mesa[egl(+),gbm(+)?,wayland?,X?] >=media-libs/taglib-1.9.0 - =media-video/ffmpeg-6*:=[encode,soc(-)?,postproc,vaapi?,vdpau?,X?] sci-libs/kissfft virtual/libiconv virtual/ttf-fonts @@ -194,6 +201,15 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS} samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) + system-ffmpeg? ( + =media-video/ffmpeg-6*:=[encode,soc(-)?,postproc,vaapi?,vdpau?,X?] + ) + !system-ffmpeg? ( + app-arch/bzip2 + app-arch/xz-utils + media-libs/dav1d:= + net-libs/gnutls:= + ) udf? ( >=dev-libs/libudfread-1.0.0 ) @@ -253,12 +269,17 @@ BDEPEND=" dev-build/cmake dev-lang/swig virtual/pkgconfig - <=virtual/jre-17:* + <=virtual/jre-21:* doc? ( app-text/doxygen ) " +PATCHES=( + "${FILESDIR}"/kodi-21-optional-ffmpeg-libx11.patch + "${FILESDIR}"/kodi-21.1-silence-libdvdread-git.patch +) + # bug #544020 CONFIG_CHECK="~IP_MULTICAST" ERROR_IP_MULTICAST=" @@ -318,11 +339,17 @@ src_prepare() { } src_configure() { + local core_platform=( + $(usev gbm) + $(usev wayland) + $(usev X x11) + ) + local mycmakeargs=( -Wno-dev # less noise -DAPP_RENDER_SYSTEM=$(usex gles gles gl) - -DCORE_PLATFORM_NAME=$(usev gbm)$(usev wayland)$(usev X x11) + -DCORE_PLATFORM_NAME="${core_platform[*]}" -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" -DENABLE_TESTING=$(usex test) -DVERBOSE=ON @@ -353,7 +380,7 @@ src_configure() { -DENABLE_CEC=$(usex cec) -DENABLE_DBUS=$(usex dbus) -DENABLE_DVDCSS=$(usex css) - -DENABLE_EVENTCLIENTS=ON # alway enable to have 'kodi-send' and filter extra staff in 'src_install()' + -DENABLE_EVENTCLIENTS=ON # alway enable to have 'kodi-send' and filter extra stuff in 'src_install()' -DENABLE_ISO9660PP=$(usex optical) -DENABLE_LCMS2=$(usex lcms) -DENABLE_LIRCCLIENT=$(usex lirc) @@ -461,13 +488,20 @@ src_test() { # 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) # Tries to ping localhost, naturally breaking network-sandbox TestNetwork.PingHost ) + if use arm || use x86; then + # bug #779184 + # https://github.com/xbmc/xbmc/issues/18594 + CMAKE_SKIP_TESTS+=( + TestDateTime.Reset + TestDateTime.SetDateTime + TestDateTime.SetFromDBTime + ) + fi + # see https://github.com/xbmc/xbmc/issues/17860#issuecomment-630120213 local -x KODI_HOME="${BUILD_DIR}" diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild index e4efd7f63cd8..1b42bd7ce45e 100644 --- a/media-tv/kodi/kodi-9999.ebuild +++ b/media-tv/kodi/kodi-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -CODENAME="" +CODENAME="Piers" # libdvd{css,read,nav} are not unbundlable without patching the buildsystem. @@ -19,16 +19,16 @@ GROOVY_VERSION="4.0.16" APACHE_COMMON_LANG_VERSION="3.14.0" APACHE_COMMON_TEXT_VERSION="1.11.0" -# Doesn't build with jdk-21 -_JAVA_PKG_WANT_BUILD_VM=( {openjdk{,-jre},icedtea}{,-bin}-{8,11,17} ) +_JAVA_PKG_WANT_BUILD_VM=( {openjdk{,-jre},icedtea}{,-bin}-{8,11,17,21} ) 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" +JAVA_PKG_WANT_SOURCE="21" +JAVA_PKG_WANT_TARGET="21" PYTHON_REQ_USE="sqlite,ssl" PYTHON_COMPAT=( python3_{10..12} ) +# 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 \ @@ -67,11 +67,19 @@ 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 ~x86" + KEYWORDS="~amd64 ~arm64 ~riscv ~x86" S=${WORKDIR}/xbmc-${MY_PV} fi LICENSE="GPL-2+" +# vendored dependencies +# apache-groovy, common-lang3 and commons-text +LICENSE+=" Apache-2.0" +# libdvdnav, libdvdread and libdvdcss. +LICENSE+=" GPL-2+" +# ffmpeg built as USE="gpl" +LICENSE+=" !system-ffmpeg? ( 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 @@ -79,7 +87,7 @@ SLOT="0" IUSE="airplay alsa bluetooth bluray caps cec +css dbus doc eventclients gbm gles lcms libusb lirc mariadb mysql nfs +optical pipewire pulseaudio samba soc +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 ) @@ -110,19 +118,19 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS} >=dev-libs/libcdio-2.1.0:=[cxx] >=dev-libs/libfmt-6.1.2:= dev-libs/libfstrcmp - dev-libs/libpcre[cxx] + dev-libs/libpcre2:= >=dev-libs/openssl-1.1.1k:0= >=dev-libs/spdlog-1.5.0:= dev-libs/tinyxml[stl] dev-libs/tinyxml2:= media-fonts/roboto + media-gfx/exiv2:= media-libs/libglvnd[X?] >=media-libs/freetype-2.10.1 media-libs/harfbuzz:= >=media-libs/libass-0.15.0:= media-libs/mesa[egl(+),gbm(+)?,wayland?,X?] >=media-libs/taglib-1.9.0 - =media-video/ffmpeg-6*:=[encode,soc(-)?,postproc,vaapi?,vdpau?,X?] virtual/libiconv virtual/ttf-fonts x11-libs/libdrm @@ -193,6 +201,15 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS} samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) + system-ffmpeg? ( + =media-video/ffmpeg-6*:=[encode,soc(-)?,postproc,vaapi?,vdpau?,X?] + ) + !system-ffmpeg? ( + app-arch/bzip2 + app-arch/xz-utils + media-libs/dav1d:= + net-libs/gnutls:= + ) udf? ( >=dev-libs/libudfread-1.0.0 ) @@ -252,12 +269,17 @@ BDEPEND=" dev-build/cmake dev-lang/swig virtual/pkgconfig - <=virtual/jre-17:* + <=virtual/jre-21:* doc? ( app-text/doxygen ) " +PATCHES=( + "${FILESDIR}"/kodi-21-optional-ffmpeg-libx11.patch + "${FILESDIR}"/kodi-21.1-silence-libdvdread-git.patch +) + # bug #544020 CONFIG_CHECK="~IP_MULTICAST" ERROR_IP_MULTICAST=" @@ -310,11 +332,17 @@ src_prepare() { } src_configure() { + local core_platform=( + $(usev gbm) + $(usev wayland) + $(usev X x11) + ) + local mycmakeargs=( -Wno-dev # less noise -DAPP_RENDER_SYSTEM=$(usex gles gles gl) - -DCORE_PLATFORM_NAME=$(usev gbm)$(usev wayland)$(usev X x11) + -DCORE_PLATFORM_NAME="${core_platform[*]}" -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" -DENABLE_TESTING=$(usex test) -DVERBOSE=ON @@ -345,7 +373,7 @@ src_configure() { -DENABLE_CEC=$(usex cec) -DENABLE_DBUS=$(usex dbus) -DENABLE_DVDCSS=$(usex css) - -DENABLE_EVENTCLIENTS=ON # alway enable to have 'kodi-send' and filter extra staff in 'src_install()' + -DENABLE_EVENTCLIENTS=ON # alway enable to have 'kodi-send' and filter extra stuff in 'src_install()' -DENABLE_ISO9660PP=$(usex optical) -DENABLE_LCMS2=$(usex lcms) -DENABLE_LIRCCLIENT=$(usex lirc) @@ -372,15 +400,17 @@ src_configure() { -DWITH_FFMPEG=$(usex system-ffmpeg) #To bundle or not - -DENABLE_INTERNAL_CROSSGUID=OFF + -DENABLE_INTERNAL_CEC=OFF -DENABLE_INTERNAL_CURL=OFF + -DENABLE_INTERNAL_CROSSGUID=OFF -DENABLE_INTERNAL_DAV1D=OFF + -DENABLE_INTERNAL_EXIV2=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_PCRE=OFF + -DENABLE_INTERNAL_PCRE2=OFF -DENABLE_INTERNAL_RapidJSON=OFF -DENABLE_INTERNAL_SPDLOG=OFF -DENABLE_INTERNAL_TAGLIB=OFF @@ -449,13 +479,20 @@ src_test() { # Known failing, unreliable test # bug #743938 TestCPUInfo.GetCPUFrequency - # bug #779184 - # https://github.com/xbmc/xbmc/issues/18594 - $(usev x86 TestDateTime.SetFromDBTime) # Tries to ping localhost, naturally breaking network-sandbox TestNetwork.PingHost ) + if use arm || use x86; then + # bug #779184 + # https://github.com/xbmc/xbmc/issues/18594 + CMAKE_SKIP_TESTS+=( + TestDateTime.Reset + TestDateTime.SetDateTime + TestDateTime.SetFromDBTime + ) + fi + # see https://github.com/xbmc/xbmc/issues/17860#issuecomment-630120213 local -x KODI_HOME="${BUILD_DIR}" diff --git a/media-tv/kodi/metadata.xml b/media-tv/kodi/metadata.xml index 00f1f2a7232c..0371c8c122fd 100644 --- a/media-tv/kodi/metadata.xml +++ b/media-tv/kodi/metadata.xml @@ -17,18 +17,14 @@ <flag name="lirc">Enable support for IR remote controls using <pkg>app-misc/lirc</pkg></flag> <flag name="mariadb">Enable support store of media library metadata on local or remote MariaDB</flag> <flag name="mysql">Enable support store of media library metadata on local or remote MySQL</flag> - <flag name="dav1d">Enables AV1 decoding via <pkg>media-libs/dav1d</pkg></flag> <flag name="nfs">Enable NFS client support</flag> <flag name="optical">Enable Audio CD playback, optical disks detection and reading (CD-ROM, Video CD, and others), and ISO optical disk images direct reading. DVD disks may require additional 'udf' flag.</flag> <flag name="pipewire">Enable pipewire support</flag> - <flag name="power-control">Enable control of shutdown, reboot, suspend, and hibernate</flag> - <flag name="raspberry-pi">Enable support for the Raspberry Pi</flag> <flag name="soc">Use additional <pkg>media-video/ffmpeg</pkg> patches for efficient playback on some SoCs (e.g. ARM, RISC-V)</flag> <flag name="system-ffmpeg">Use system ffmpeg instead of the bundled one</flag> <flag name="libusb">Use <pkg>virtual/libusb</pkg> for usb device hotplug support. This flag should only be enabled if you're running a non-Linux kernel or you don't want to use udev.</flag> <flag name="udf">Enable UDF support. Required for playing blurays.</flag> <flag name="udev">Use udev rules to handle devices' permissions and hotplug support. Unless you know what you're doing do not disable this flag on Linux kernels. This is provided as an option for completeness.</flag> - <flag name="upower">Use <pkg>sys-power/upower</pkg> to get battery level and active power source</flag> <flag name="webserver">Enable internal webserver</flag> <flag name="xslt">Enable metadata XSLT scrapers support with <pkg>dev-libs/libxslt</pkg></flag> </use> diff --git a/media-tv/mythtv/mythtv-33.1-r1.ebuild b/media-tv/mythtv/mythtv-33.1-r2.ebuild index 34c97cbba763..61c42a783f0d 100644 --- a/media-tv/mythtv/mythtv-33.1-r1.ebuild +++ b/media-tv/mythtv/mythtv-33.1-r2.ebuild @@ -6,7 +6,7 @@ EAPI=8 DISABLE_AUTOFORMATTING="yes" PYTHON_COMPAT=( python3_{10..12} ) -inherit edo flag-o-matic java-pkg-opt-2 java-ant-2 python-any-r1 +inherit edo flag-o-matic java-pkg-opt-2 python-any-r1 inherit qmake-utils readme.gentoo-r1 systemd toolchain-funcs user-info DESCRIPTION="Open Source DVR and media center hub" @@ -107,7 +107,7 @@ RDEPEND=" xmltv? ( dev-perl/XML-LibXML media-tv/xmltv - ) + ) xvid? ( media-libs/xvid ) zeroconf? ( dev-libs/openssl:= @@ -131,6 +131,7 @@ DEPEND=" " BDEPEND=" virtual/pkgconfig + java? ( >=dev-java/ant-1.10.14-r3 ) opengl? ( virtual/opengl ) python? ( ${PYTHON_DEPS} @@ -163,6 +164,10 @@ pkg_setup() { src_prepare() { default + cat > external/libmythbluray/src/libbluray/bdj/build.properties <<-EOF + java_version_asm=1.8 + java_version_bdj=1.8 + EOF # https://github.com/MythTV/mythtv/pull/824 # https://github.com/MythTV/mythtv/pull/838 # https://bugs.gentoo.org/888291 @@ -366,7 +371,8 @@ src_install() { use python && python_fix_shebang "${ED}/usr/share/mythtv" # Make shell & perl scripts executable - find "${ED}" -type f \( -name '*.sh' -o -name '*.pl' \) -exec chmod a+x {} \; || die "Failed to make script executable" + find "${ED}" -type f \( -name '*.sh' -o -name '*.pl' \) -exec chmod a+x {} \; \ + || die "Failed to make script executable" } pkg_postinst() { diff --git a/media-tv/plex-media-server/Manifest b/media-tv/plex-media-server/Manifest index ba9c5986a979..1c05b2acefaa 100644 --- a/media-tv/plex-media-server/Manifest +++ b/media-tv/plex-media-server/Manifest @@ -1,12 +1,8 @@ -DIST plexmediaserver_1.40.2.8395-c67dce28e_amd64.deb 82029834 BLAKE2B 3f0acd1d8dc554ee4539c0dc36976935c975b2ed54824805835d490d33d4d8319f5c67ec2926ca253fd1dcac97b3daad13e98e2a80f35403cf2d7c58f25786f5 SHA512 6a20b3e9af5097667fed5768262fcb4c5182cbf0db9edf2f8870e41063191c1420ea4a1e9abd39a5168a37b9445088e61d167731c9b5f3914d7c4ff25834ceb5 -DIST plexmediaserver_1.40.2.8395-c67dce28e_arm64.deb 73766282 BLAKE2B d0ddf6718465aeae596c1a8391962b576beceb4cfdb3a23eee1bf18585e8fb42c0409ef3fbc43fd09a8977a1fa9143ea20fa8432accfc6e4bda7622bed59bfaf SHA512 58269cba44aaecb7c7720517bcdc3baee2cf42b265c6c910066459cfb462f9ccd5dd88fe2fa43bc19954782a5a6f4525d7436158a0662b80ce422cc7896f0922 -DIST plexmediaserver_1.40.2.8395-c67dce28e_armhf.deb 70899814 BLAKE2B 87cb5cd21ed08f11609063a1836c51413193bec3a0fe4ba81212fd8383136805c591875ad42d170f08f41e986c50679841db6b4ba7517b9e78a01af7f4a5b8d5 SHA512 744d19fd708ab8e77fbeac15ad52069105ec92b7c391b1452e92417adaf7bfbb6d70d6fcabc556ea5467631433db08bbfea83fe7fa4e0b1462b473f32d6b91d6 -DIST plexmediaserver_1.40.2.8395-c67dce28e_i386.deb 74590626 BLAKE2B fa42e617a02c3403a7fc2d45bb6c7e56a78ebfcf7bc34f45da2cc67a912a163001ef2f87383abde7d5de51e74bbcd439abd12e866f8106d4e7fd5a67e0172755 SHA512 89a6905b662a83e0af9872a1cf801ba1fa9b08976a606ef64fdee61f49709f0c5b4e3d2acd6d9e0e4e7605a16401902f5282ecb1a39f47833591dc054d3dedc2 -DIST plexmediaserver_1.40.3.8555-fef15d30c_amd64.deb 81659190 BLAKE2B 021322da3442e4288f6fd4b2cb9081073a9fdbce4039a6c518a1357c294369cbd571b2e51284cbd67e427118448919a189be65455e53378d2a5ec0fae9b0e300 SHA512 145f90d31d6384358b06d0fc9b0d7712435607b8806e16b84e8110190fe192ac7e86da4730d1de33ea824dd8c79026f69d315906e1a0ac3e418ba6ab8a862e1c -DIST plexmediaserver_1.40.3.8555-fef15d30c_arm64.deb 73914470 BLAKE2B 901386536c2540230217fac7cbb37566fde4e5f809f4e1d0fc381a44974cad5ae13dbc7a9e7af62e9b138b8e4d40d726afef7c5813f2eef846e21e372f2152e1 SHA512 c15a6a454a0c0d09c75e02db93f6eec45d7127bfb38354bd565b5b83ec133dd8e32413a079a91d623987381e0eac02f5c0c43ff2b0cf8e08343699d70ceabf05 -DIST plexmediaserver_1.40.3.8555-fef15d30c_armhf.deb 73976334 BLAKE2B 4953ac4bc1e9138795c0abd0c04e9f83f4243d607bdcd40ba71ef8cbc646ffbc73139317f1218a499bc0e2da010ec4fe567da8fff20ceac0adee906e5012732e SHA512 a357385aa0424dc3b91299381eaa86a4dcc117009d2aab4cc6c079755a981c2de3ea23134400adaa7165f0621ae5679c4e33774c12aa0875ab32086d2de32e79 -DIST plexmediaserver_1.40.3.8555-fef15d30c_i386.deb 74919610 BLAKE2B 2303ebff407951a25442b26b812c45b535a5ad63b5988ecb63227e27335218c6972593144332308ba751d9ea9f4636a109fba5ec73b5aee36b0c0880ffaa0558 SHA512 2322db24d4dd1744bc42d1b94dda02477a328ae0cab06367031ede4a860f481b78358270c2e923e5fa3b5662fe5b546d11a964dec98582e3631159f3864121a2 -DIST plexmediaserver_1.40.4.8679-424562606_amd64.deb 81712638 BLAKE2B 9785f29c07e9d386a87f076703695c80e46c455a1eb9eb90dca33ce15c2707f774f729965471017e529dee6a51ed9e0cf0df98ebc3dedf478dd3d16da94a7f91 SHA512 58ef48a78e79047dbc00866959f1df15ee36cec445e3b88ee69b623636f1d6bb10001587e13d13851a3c24f298e2d12bb7da6946cf6b99b9c5fb4564e83ca201 -DIST plexmediaserver_1.40.4.8679-424562606_arm64.deb 73952850 BLAKE2B 1df7cb2b29aae0698947ecc8c6a07c848ae0daa3880a7256c79c043692922c10ef838646c0e69679948f5bfee3b4cd025f327719d959f87f68d77f93bc8898c5 SHA512 6d6285a806367324df980f6eed1036726e8ee779956c11035ed01edb908816f4713483b803406c4bc306c43432210c3c74ae8aa8361930954d1c61810ce639b6 -DIST plexmediaserver_1.40.4.8679-424562606_armhf.deb 74224106 BLAKE2B dd48f29d8e73544d0ab2076108a3cc50bbd63537b61c251041ae69bf60457baecd5333fb52315c7cd5b2a4c4d459f0f8d0d307d4ed9650908390f391d51fccb0 SHA512 247bab93068639ae6213c11d6c8ca598666bca73f7a2a51463665c00f471f9fe9523bdfeeee6fbcce3d2a50cd50dec2e5070903154490719e7814f34fe87111e -DIST plexmediaserver_1.40.4.8679-424562606_i386.deb 74868902 BLAKE2B cde6382b33a7c7d9c2d30df05251d0f15263e7a530561fe22b484526bec94f0b1456d757c30b3c336b7b44ad5bfd8596e655a2312260404d05beba2e39276ab0 SHA512 511e6449a15736c5ce2fa067f4574dd2c36bbd1f41bd10854127cdc111bc0916370486448324a9e23654c7a79c13159351470a0fc11e86c3559300e5b2f23b1e +DIST plexmediaserver_1.40.5.8854-f36c552fd_amd64.deb 81245190 BLAKE2B 66055a6e0ba0b8e84e791bae201b9b640baa94a0147eb0f54f07f124757b597b807c67fbc274fc8e64f05e1f17c437f6d9c7baeaa6b364917277e9afbfb03db3 SHA512 2a53305bea57c59626b7f83213c71f02c7766142c3eaf416aba86e9754a128686c95688574e1bb206807fb5d4b1b02a9ba837870e17a0d447dafaecd6b50de90 +DIST plexmediaserver_1.40.5.8854-f36c552fd_arm64.deb 73833094 BLAKE2B 9c0354f9363867cc68db0ce796a0ecf77252cfe3249e9245159db2bdeeede37d794492d98fffe3857e3fb69d66e16c27584b225fec7118379775b0ee975bd907 SHA512 b004e855005e88188818ea961e23037191873e7f39c23b5fa337995686da58706313817a6791b653b4d07304643adac2388a5d4d3d1b28643f9f118db14d82b1 +DIST plexmediaserver_1.40.5.8854-f36c552fd_armhf.deb 74086042 BLAKE2B 2b74a5789a354af9122e5b9ae2358d9cbc433a85cb3f52b850539ab13dd24aefdd1dc4cadc37953ac0be5d3e55293f12a80b96c04e298a4ed89e850a2067577f SHA512 aff06f07e419adc3aa6afb260115986154d768d00f3406bb51d4ef0334bffe076875e3af208575f719c3b3a23d477dbe67e23999bec620df851cb7be1555f1bc +DIST plexmediaserver_1.40.5.8854-f36c552fd_i386.deb 74784106 BLAKE2B 4e3818583709cfd4fc4d28152bf4692e221d1bafbef9dcd306e8c939b526563d9e7d7773c8dcf0562725d5e2d9287f22c7ad421f390d738866a39d07bef46a73 SHA512 8e137f5565f5cfc36fdb80c64abb7b9c7b5e0054da97c44f3d5ff73e8b00ebd8a8e7cba0bec79a2ff0ca9fb7c9e42e593c9211813538fe758b66a7522e55ed39 +DIST plexmediaserver_1.40.5.8921-836b34c27_amd64.deb 81250582 BLAKE2B 4d99c06a141744ecdf595a3bd1472e5b2530b481e1f91f75072fa28b11996bb7d3e0a6808f37e98c0c2db315eb7d69a8687edffb4d00c92974e826e88cf08571 SHA512 71e0b0b0e614dee395461dc511afa4e71ad7a5dfb803116f21ea6210c0d4940b0e08b825eb485fdbf88054ec4dd41b97f0b0158e683ab262f4fa36984e24314a +DIST plexmediaserver_1.40.5.8921-836b34c27_arm64.deb 73844562 BLAKE2B 7310ceb9c7af6da0e62a9cc55405d6f63aa99e8f9563b25b5fa66887ca17ca34d78f39357cfb521ac5e01cafd6c3195238a87994542cd5dc60468e2e392ab206 SHA512 29f60923d8ea0b28218aaba0d962aa25c90f652d5b8b4e93573171e7b3521e2b18b4bb9a5381dec78cf61ebafc7595e93647f10f836086de6a3edda17d58975f +DIST plexmediaserver_1.40.5.8921-836b34c27_armhf.deb 74074378 BLAKE2B a81bb2038c52d6bb9299c6bc51f22b3c896d54bdb3c07cba5aa09daaf03cb34e45c88cef7753e6ce409445a0a6e022b7d712a2cc7a21dbc9bc0d50eed42d851a SHA512 77c2b90c2fef476573ca4a7f7874ff5f3356c9cabf733bd33e16687469a28d6b97bd5a80d8900a94309cef34c473164f6d698029370e99fc8ca04d141b2805b4 +DIST plexmediaserver_1.40.5.8921-836b34c27_i386.deb 74786146 BLAKE2B 8bbd8c3f60103c8048553c3d80e7ff045e79debf6f021c606501328cc61f4e270723d977fbef5ae4fbf9975542331eb83009f313ff93cfd964eff14528eed6a2 SHA512 914cf58fc2458b82c68a64c10845ff30c7146d3bd0ea4c47eefc5089c0b7d8e12a946d6557e48b61f0e9532aa1d98b56ecddf527d453d9340376856a93123a9f diff --git a/media-tv/plex-media-server/plex-media-server-1.40.2.8395.ebuild b/media-tv/plex-media-server/plex-media-server-1.40.2.8395.ebuild deleted file mode 100644 index 165fb8db5c54..000000000000 --- a/media-tv/plex-media-server/plex-media-server-1.40.2.8395.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit readme.gentoo-r1 systemd unpacker pax-utils - -MY_PV="${PV}-c67dce28e" -MY_URI="https://downloads.plex.tv/plex-media-server-new" - -DESCRIPTION="Free media library that is intended for use with a plex client" -HOMEPAGE="https://www.plex.tv/" -SRC_URI=" - amd64? ( ${MY_URI}/${MY_PV}/debian/plexmediaserver_${MY_PV}_amd64.deb ) - arm? ( ${MY_URI}/${MY_PV}/debian/plexmediaserver_${MY_PV}_armhf.deb ) - arm64? ( ${MY_URI}/${MY_PV}/debian/plexmediaserver_${MY_PV}_arm64.deb ) - x86? ( ${MY_URI}/${MY_PV}/debian/plexmediaserver_${MY_PV}_i386.deb ) -" -S="${WORKDIR}" - -LICENSE="Plex" -SLOT="0" -KEYWORDS="-* amd64 ~arm arm64 ~x86" -RESTRICT="bindist" - -DEPEND=" - acct-group/plex - acct-user/plex" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}.service.patch" -) - -QA_DESKTOP_FILE="usr/share/applications/plexmediamanager.desktop" -QA_PREBUILT="*" -QA_MULTILIB_PATHS=( - "usr/lib/plexmediaserver/lib/.*" - "usr/lib/plexmediaserver/Resources/Python/lib/python2.7/.*" - "usr/lib/plexmediaserver/Resources/Python/lib/python2.7/lib-dynload/_hashlib.so" -) - -BINS_TO_PAX_MARK=( - "${ED}/usr/lib/plexmediaserver/Plex Script Host" - "${ED}/usr/lib/plexmediaserver/Plex Media Scanner" -) - -src_install() { - # Remove Debian specific files - rm -r "usr/share/doc" || die - - # Copy main files over to image and preserve permissions so it is portable - cp -rp usr/ "${ED}" || die - - # Make sure the logging directory is created - keepdir /var/log/pms - fowners plex:plex /var/log/pms - - keepdir /var/lib/plexmediaserver - fowners plex:plex /var/lib/plexmediaserver - - # Install the OpenRC init/conf files - newinitd "${FILESDIR}/${PN}.init.d" ${PN} - newconfd "${FILESDIR}/${PN}.conf.d" ${PN} - - # Install systemd service file - systemd_newunit "${ED}"/usr/lib/plexmediaserver/lib/plexmediaserver.service "${PN}.service" - - # Add pax markings to some binaries so that they work on hardened setup - local f - for f in "${BINS_TO_PAX_MARK[@]}"; do - pax-mark m "${f}" - done - - # Adds the precompiled plex libraries to the revdep-rebuild's mask list - # so it doesn't try to rebuild libraries that can't be rebuilt. - insinto /etc/revdep-rebuild - doins "${FILESDIR}"/80plexmediaserver - - readme.gentoo_create_doc -} - -pkg_postinst() { - readme.gentoo_print_elog - - einfo - ewarn "IMPORTANT: This version makes changes to the database which will require 1.31.2 or higher to start" - ewarn "Please also be patient when updating to this version, initial run may take time as database is upgraded" - ewarn "Full release announcement, including instructions for rollback: https://forums.plex.tv/t/plex-media-server/30447/612" - -} diff --git a/media-tv/plex-media-server/plex-media-server-1.40.4.8679.ebuild b/media-tv/plex-media-server/plex-media-server-1.40.5.8854.ebuild index 6dd77f9a9ed1..a94f1991c0c0 100644 --- a/media-tv/plex-media-server/plex-media-server-1.40.4.8679.ebuild +++ b/media-tv/plex-media-server/plex-media-server-1.40.5.8854.ebuild @@ -5,7 +5,7 @@ EAPI=8 inherit readme.gentoo-r1 systemd unpacker pax-utils -MY_PV="${PV}-424562606" +MY_PV="${PV}-f36c552fd" MY_URI="https://downloads.plex.tv/plex-media-server-new" DESCRIPTION="Free media library that is intended for use with a plex client" @@ -20,7 +20,7 @@ S="${WORKDIR}" LICENSE="Plex" SLOT="0" -KEYWORDS="-* ~amd64 ~arm ~arm64 ~x86" +KEYWORDS="-* amd64 ~arm arm64 ~x86" RESTRICT="bindist" DEPEND=" diff --git a/media-tv/plex-media-server/plex-media-server-1.40.3.8555.ebuild b/media-tv/plex-media-server/plex-media-server-1.40.5.8921.ebuild index 9647666c641b..19d891247a22 100644 --- a/media-tv/plex-media-server/plex-media-server-1.40.3.8555.ebuild +++ b/media-tv/plex-media-server/plex-media-server-1.40.5.8921.ebuild @@ -5,7 +5,7 @@ EAPI=8 inherit readme.gentoo-r1 systemd unpacker pax-utils -MY_PV="${PV}-fef15d30c" +MY_PV="${PV}-836b34c27" MY_URI="https://downloads.plex.tv/plex-media-server-new" DESCRIPTION="Free media library that is intended for use with a plex client" @@ -40,11 +40,6 @@ QA_MULTILIB_PATHS=( "usr/lib/plexmediaserver/Resources/Python/lib/python2.7/lib-dynload/_hashlib.so" ) -BINS_TO_PAX_MARK=( - "${ED}/usr/lib/plexmediaserver/Plex Script Host" - "${ED}/usr/lib/plexmediaserver/Plex Media Scanner" -) - src_install() { # Remove Debian specific files rm -r "usr/share/doc" || die @@ -67,6 +62,11 @@ src_install() { systemd_newunit "${ED}"/usr/lib/plexmediaserver/lib/plexmediaserver.service "${PN}.service" # Add pax markings to some binaries so that they work on hardened setup + BINS_TO_PAX_MARK=( + "${ED}/usr/lib/plexmediaserver/Plex Script Host" + "${ED}/usr/lib/plexmediaserver/Plex Media Scanner" + ) + local f for f in "${BINS_TO_PAX_MARK[@]}"; do pax-mark m "${f}" diff --git a/media-tv/v4l-utils/Manifest b/media-tv/v4l-utils/Manifest deleted file mode 100644 index eaca215a25f2..000000000000 --- a/media-tv/v4l-utils/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST v4l-utils-1.22.1.tar.bz2 2086238 BLAKE2B a3f01a17ea7c8925c74dd883d30b42f54b7926d253dac79e4cadaba43abc33672804257b3b92e5aa640ead6b5aaaa2458f05e21642044d7dea77e5580a8dbe9a SHA512 8a634d8995d13f453dfaf90ca5d0dfb26f2f4b10a0d200d76a949c46f77040d12fc0a5b35e05d7b1ba68bcfc85a445be5a5ab1d4a7d4eabfe3a254038ccc6170 diff --git a/media-tv/v4l-utils/files/v4l-utils-1.22.1-no-stack-protector-bpf.patch b/media-tv/v4l-utils/files/v4l-utils-1.22.1-no-stack-protector-bpf.patch deleted file mode 100644 index 0ee28643ea1c..000000000000 --- a/media-tv/v4l-utils/files/v4l-utils-1.22.1-no-stack-protector-bpf.patch +++ /dev/null @@ -1,25 +0,0 @@ -SSP doesn't make sense for BPF. - -https://bugs.gentoo.org/889561 ---- a/utils/keytable/Makefile.am -+++ b/utils/keytable/Makefile.am -@@ -22,7 +22,7 @@ ir_keytable_LDFLAGS = $(ARGP_LIBS) - - if WITH_BPF - ir_keytable_LDFLAGS += $(LIBELF_LIBS) $(LIBBPF_LIBS) --ir_keytable_CFLAGS = $(LIBBPF_CFLAGS) -+ir_keytable_CFLAGS = $(LIBBPF_CFLAGS) -fno-stack-protector - SUBDIRS = bpf_protocols - endif - ---- a/utils/keytable/bpf_protocols/Makefile.am -+++ b/utils/keytable/bpf_protocols/Makefile.am -@@ -8,7 +8,7 @@ CLANG_SYS_INCLUDES := $(shell $(CLANG) -v -E - </dev/null 2>&1 \ - | sed -n '/<...> search starts here:/,/End of search list./{ s| \(/.*\)|-idirafter \1|p }') - - %.o: %.c bpf_helpers.h -- $(CLANG) $(CLANG_SYS_INCLUDES) -D__linux__ -I$(top_srcdir)/include -target bpf -O2 -c $< -+ $(CLANG) $(CLANG_SYS_INCLUDES) -D__linux__ -I$(top_srcdir)/include -target bpf -O2 -fno-stack-protector -c $< - - PROTOCOLS = grundig.o pulse_distance.o pulse_length.o rc_mm.o manchester.o xbox-dvd.o imon_rsc.o raw.o samsung36.o - diff --git a/media-tv/v4l-utils/metadata.xml b/media-tv/v4l-utils/metadata.xml deleted file mode 100644 index a320ecd97a79..000000000000 --- a/media-tv/v4l-utils/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>chewi@gentoo.org</email> - <name>James Le Cuirot</name> - </maintainer> -<use> - <flag name="bpf">Enables support for IR BPF decoders.</flag> -</use> -</pkgmetadata> diff --git a/media-tv/v4l-utils/v4l-utils-1.22.1-r1.ebuild b/media-tv/v4l-utils/v4l-utils-1.22.1-r1.ebuild deleted file mode 100644 index 1294a25de248..000000000000 --- a/media-tv/v4l-utils/v4l-utils-1.22.1-r1.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools toolchain-funcs udev xdg - -DESCRIPTION="Separate utilities ebuild from upstream v4l-utils package" -HOMEPAGE="https://git.linuxtv.org/v4l-utils.git" -SRC_URI="https://linuxtv.org/downloads/v4l-utils/${P}.tar.bz2" - -LICENSE="GPL-2+ LGPL-2.1+" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 sparc x86" -IUSE="+bpf dvb opengl qt5 +udev" - -RDEPEND=" - >=media-libs/libv4l-${PV}[dvb?] - bpf? ( - <dev-libs/libbpf-1:= - virtual/libelf:= - ) - udev? ( virtual/libudev ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - opengl? ( dev-qt/qtopengl:5[-gles2(-)] virtual/opengl ) - media-libs/alsa-lib - ) - !media-tv/v4l2-ctl - !<media-tv/ivtv-utils-1.4.0-r2 -" - -DEPEND=" - ${RDEPEND} -" - -BDEPEND=" - sys-devel/gettext - virtual/pkgconfig - bpf? ( sys-devel/clang:*[llvm_targets_BPF] ) -" - -# Not really prebuilt but BPF objects make our QA checks go crazy. -QA_PREBUILT="*/rc_keymaps/protocols/*.o" - -PATCHES=( - "${FILESDIR}"/${PN}-1.22.1-no-stack-protector-bpf.patch -) - -check_llvm() { - if [[ ${MERGE_TYPE} != binary ]] && use bpf; then - local clang=${ac_cv_prog_CLANG:-${CLANG:-clang}} - ${clang} -target bpf -print-supported-cpus &>/dev/null || - die "${clang} does not support the BPF target. Please check LLVM_TARGETS." - fi -} - -pkg_pretend() { - has_version -b sys-devel/clang && check_llvm -} - -pkg_setup() { - check_llvm -} - -src_prepare() { - default - eautoreconf -} - -src_configure() { - if use qt5; then - local qt5_paths=( \ - MOC="$($(tc-getPKG_CONFIG) --variable=host_bins Qt5Core)/moc" \ - UIC="$($(tc-getPKG_CONFIG) --variable=host_bins Qt5Core)/uic" \ - RCC="$($(tc-getPKG_CONFIG) --variable=host_bins Qt5Core)/rcc" \ - ) - if ! use opengl; then - sed -e 's/Qt5OpenGL/DiSaBlEd/g' -i configure || die - fi - fi - - # Hard disable the flags that apply only to the libs. - econf \ - --disable-static \ - $(use_enable dvb libdvbv5) \ - $(use_enable qt5 qv4l2) \ - $(use_enable qt5 qvidcap) \ - $(use_enable bpf) \ - --without-jpeg \ - $(use_with udev libudev) \ - --with-udevdir="$(get_udevdir)" \ - "${qt5_paths[@]}" -} - -src_install() { - emake -C utils DESTDIR="${D}" install - emake -C contrib DESTDIR="${D}" install - - dodoc README - newdoc utils/libv4l2util/TODO TODO.libv4l2util - newdoc utils/libmedia_dev/README README.libmedia_dev - newdoc utils/dvb/README README.dvb - newdoc utils/v4l2-compliance/fixme.txt fixme.txt.v4l2-compliance -} - -pkg_postinst() { - xdg_pkg_postinst - use udev && udev_reload - - if [[ -n ${REPLACING_VERSIONS} ]] && ver_test 1.20.0 -ge ${REPLACING_VERSIONS%% *}; then - ewarn "WARNING! ir-keytable has changed significantly from version 1.20.0 so" - ewarn "you may need to take action to avoid breakage. See" - ewarn "https://bugs.gentoo.org/767175 for more details." - fi -} - -pkg_postrm() { - xdg_pkg_postrm - use udev && udev_reload -} diff --git a/media-tv/v4l-utils/v4l-utils-1.26.ebuild b/media-tv/v4l-utils/v4l-utils-1.26.ebuild deleted file mode 100644 index 179042a3715e..000000000000 --- a/media-tv/v4l-utils/v4l-utils-1.26.ebuild +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="Transitional package to be superseded by media-libs/libv4l[utils]" -HOMEPAGE="https://git.linuxtv.org/v4l-utils.git" - -LICENSE="GPL-2+ LGPL-2.1+" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ppc64 sparc x86" -IUSE="+bpf dvb qt5" - -RDEPEND=">=media-libs/libv4l-${PV}[utils,bpf?,dvb?,qt5?]" |