From 2700d3c00aa3fc889c3c1cfe61248d401f3ab463 Mon Sep 17 00:00:00 2001 From: David Guglielmi Date: Sun, 28 Apr 2024 19:12:20 +0200 Subject: [PATCH] media-plugins/kodi-*: moved to github.com/kodi-overlay/kodi-overlay --- eclass/kodi-addon.eclass | 32 -- .../kodi-inputstream-adaptive/Manifest | 6 - .../kodi-inputstream-adaptive-20.3.18.ebuild | 49 --- .../kodi-inputstream-adaptive-21.4.4.ebuild | 50 --- .../kodi-inputstream-ffmpegdirect/Manifest | 9 - ...x-use-after-free-in-TimeshiftSegment.patch | 25 -- ...extradata-with-extract_extradata-BSF.patch | 290 ---------------- ...utstream-ffmpegdirect-20.5.0-ffmpeg5.patch | 319 ------------------ ...utstream-ffmpegdirect-20.5.0-ffmpeg6.patch | 31 -- ...nputstream-ffmpegdirect-20.5.0-gcc13.patch | 47 --- ...-inputstream-ffmpegdirect-20.5.0-r1.ebuild | 51 --- ...odi-inputstream-ffmpegdirect-21.3.5.ebuild | 43 --- media-plugins/kodi-inputstream-rtmp/Manifest | 4 - .../kodi-inputstream-rtmp-20.3.0.ebuild | 34 -- .../kodi-inputstream-rtmp-21.1.0.ebuild | 34 -- .../kodi-peripheral-joystick/Manifest | 2 - .../kodi-peripheral-joystick-20.1.0.ebuild | 38 --- media-plugins/kodi-pvr-hts/Manifest | 4 - .../kodi-pvr-hts/kodi-pvr-hts-20.7.2.ebuild | 27 -- .../kodi-pvr-hts/kodi-pvr-hts-21.2.1.ebuild | 27 -- media-plugins/kodi-pvr-iptvsimple/Manifest | 4 - .../kodi-pvr-iptvsimple-20.13.0.ebuild | 35 -- .../kodi-pvr-iptvsimple-21.8.3.ebuild | 35 -- media-plugins/kodi-vfs-sftp/Manifest | 4 - .../kodi-vfs-sftp/kodi-vfs-sftp-20.1.0.ebuild | 30 -- .../kodi-vfs-sftp-21.0.0_pre240219.ebuild | 31 -- 26 files changed, 1261 deletions(-) delete mode 100644 eclass/kodi-addon.eclass delete mode 100644 media-plugins/kodi-inputstream-adaptive/Manifest delete mode 100644 media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-20.3.18.ebuild delete mode 100644 media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-21.4.4.ebuild delete mode 100644 media-plugins/kodi-inputstream-ffmpegdirect/Manifest delete mode 100644 media-plugins/kodi-inputstream-ffmpegdirect/files/kodi-inputstream-ffmpegdirect-20.5.0-Fix-use-after-free-in-TimeshiftSegment.patch delete mode 100644 media-plugins/kodi-inputstream-ffmpegdirect/files/kodi-inputstream-ffmpegdirect-20.5.0-Get-extradata-with-extract_extradata-BSF.patch delete mode 100644 media-plugins/kodi-inputstream-ffmpegdirect/files/kodi-inputstream-ffmpegdirect-20.5.0-ffmpeg5.patch delete mode 100644 media-plugins/kodi-inputstream-ffmpegdirect/files/kodi-inputstream-ffmpegdirect-20.5.0-ffmpeg6.patch delete mode 100644 media-plugins/kodi-inputstream-ffmpegdirect/files/kodi-inputstream-ffmpegdirect-20.5.0-gcc13.patch delete mode 100644 media-plugins/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect-20.5.0-r1.ebuild delete mode 100644 media-plugins/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect-21.3.5.ebuild delete mode 100644 media-plugins/kodi-inputstream-rtmp/Manifest delete mode 100644 media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-20.3.0.ebuild delete mode 100644 media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-21.1.0.ebuild delete mode 100644 media-plugins/kodi-peripheral-joystick/Manifest delete mode 100644 media-plugins/kodi-peripheral-joystick/kodi-peripheral-joystick-20.1.0.ebuild delete mode 100644 media-plugins/kodi-pvr-hts/Manifest delete mode 100644 media-plugins/kodi-pvr-hts/kodi-pvr-hts-20.7.2.ebuild delete mode 100644 media-plugins/kodi-pvr-hts/kodi-pvr-hts-21.2.1.ebuild delete mode 100644 media-plugins/kodi-pvr-iptvsimple/Manifest delete mode 100644 media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-20.13.0.ebuild delete mode 100644 media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-21.8.3.ebuild delete mode 100644 media-plugins/kodi-vfs-sftp/Manifest delete mode 100644 media-plugins/kodi-vfs-sftp/kodi-vfs-sftp-20.1.0.ebuild delete mode 100644 media-plugins/kodi-vfs-sftp/kodi-vfs-sftp-21.0.0_pre240219.ebuild diff --git a/eclass/kodi-addon.eclass b/eclass/kodi-addon.eclass deleted file mode 100644 index da0662c..0000000 --- a/eclass/kodi-addon.eclass +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# @ECLASS: kodi-addon.eclass -# @MAINTAINER: -# candrews@gentoo.org -# @SUPPORTED_EAPIS: 7 8 -# @PROVIDES: cmake -# @BLURB: Helper for correct building and (importantly) installing Kodi addon packages. -# @DESCRIPTION: -# Provides a src_configure function for correct CMake configuration - -case ${EAPI} in - 7|8) ;; - *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; -esac - -inherit cmake - -# @FUNCTION: kodi-addon_src_configure -# @DESCRIPTION: -# Configure handling for Kodi addons -kodi-addon_src_configure() { - - mycmakeargs+=( - -DCMAKE_INSTALL_LIBDIR="${EPREFIX}/usr/$(get_libdir)/kodi" - ) - - cmake_src_configure -} - -EXPORT_FUNCTIONS src_configure diff --git a/media-plugins/kodi-inputstream-adaptive/Manifest b/media-plugins/kodi-inputstream-adaptive/Manifest deleted file mode 100644 index e2601ff..0000000 --- a/media-plugins/kodi-inputstream-adaptive/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -DIST bento4-1.6.0-639-7-Omega.tar.gz 5481533 BLAKE2B 0636f0c94ebb3246c8720e120f3b505e4a82ed2e37d9ed44351875dcf3fab8bc2e53b83e0be43fb711aac3144d6df3d8ae2ead24fcd55bd116f3c54f07e3c19f SHA512 bf257e5831eec44db944d1313858262c1ba32b6e67564bb8f809a1aa0fc8a55faaaac2357d80f1ce2e794914f6bec5263548e77802db2b9e52998af2b6276809 -DIST bento4-1.6.0-641-Omega.tar.gz 5487100 BLAKE2B b1a92d4688731fc626327ec4900bc4808e04e496fb44d6ff711bdf427c0aa98dd785c4c9e6a31ea6f141e938199cacdaf34c7579a9b8ca58c767cf69c26d79a0 SHA512 6d08b8e028cc5a73fa634e42cb4c0e89cc4a7a700177df7ef8e9be18c02077baae25e5a0f1b8d9cb4ceb2a6ff3108e41a4a07aae5f64d9372e915efce0fbd861 -DIST kodi-inputstream-adaptive-20.3.18.tar.gz 779751 BLAKE2B 201702996b976fde820c8df6abe43b04977946e4ed0d13752e5713db1ca944146915fcdb60b1d6ebdbd42b57678a8f518bc2b683cfc0dc7ba196be85e0cfbef6 SHA512 87435271bedc1e0371356d953a170233c3a259c773f0caec7bf314c23432925215e138c5cac83da1b016fcfd0c9c1a6cbd18c87911a7ef990bc7199ffe2a67de -DIST kodi-inputstream-adaptive-21.4.4.tar.gz 813157 BLAKE2B fa0e33068ed09dc593ea0b24553316c373816c6212cc5261e65904e1fd7df01fb9a9edfd002a935d52bffaa1566db64d967fa3d9156c2cff5eec6f77f3d472cd SHA512 fbd7a625106ad7cdffd8ba6390d1cbedfb92c26bb0059f80253f0cce3788829da58da57cf36b4c9c2a158fa4be226272c6443281186766b5ee42bc718c96b167 -EBUILD kodi-inputstream-adaptive-20.3.18.ebuild 1074 BLAKE2B 3388e42f1489458b6e45ac233400527ab4be942baea39865639e43a3cb439e1a4886eeaa83c546818fa475a3716c2855e8c6acfa5d75a4b1106bc8b8d1eb5998 SHA512 e888bac841cf7426a425c4beffe69921adfda1593d2b008219800131a3d4ae3288d821e465d3794c1ef39bf1fd409e2ae908614f2aa8c7b633981d267c89a436 -EBUILD kodi-inputstream-adaptive-21.4.4.ebuild 1090 BLAKE2B 0cd14290342db50df267271458c04a84a1493a332e080215c2451a9d0d7939abfcb392ebf802df7e650f591feff40c31cdced6ebf1099531ee7d1c55b286c39c SHA512 f81ca9f463398b0429a196120853e677796a55e19d05dcdbd4ad8725b1cf4bbe5399315ad9cc1cb02d93842fe0f39d83a4c81e7aadc71d0df45cc9f1664a48c6 diff --git a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-20.3.18.ebuild b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-20.3.18.ebuild deleted file mode 100644 index 868f138..0000000 --- a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-20.3.18.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit kodi-addon - -DESCRIPTION="Kodi's Adaptive inputstream addon" -HOMEPAGE="https://github.com/xbmc/inputstream.adaptive.git" - -CODENAME="Nexus" -BENTO4_VERSION="1.6.0-639-7-Omega" - -KEYWORDS="~amd64 ~x86" -SRC_URI="https://github.com/xbmc/inputstream.adaptive/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz - https://github.com/xbmc/Bento4/archive/${BENTO4_VERSION}.tar.gz -> bento4-${BENTO4_VERSION}.tar.gz" -S="${WORKDIR}/inputstream.adaptive-${PV}-${CODENAME}" - -LICENSE="GPL-2" -SLOT="0" -RESTRICT="!test? ( test )" -IUSE="test" - -COMMON_DEPEND=" - dev-libs/expat - =media-tv/kodi-20* - " -DEPEND=" - ${COMMON_DEPEND} - test? ( dev-cpp/gtest ) - " -RDEPEND=" - ${COMMON_DEPEND} - " - -src_unpack() { - unpack ${P}.tar.gz -} - -src_configure() { - local mycmakeargs=( - -DBUILD_TESTING=$(usex test) - -DENABLE_INTERNAL_BENTO4=ON - -DBENTO4_URL="${DISTDIR}/bento4-${BENTO4_VERSION}.tar.gz" - -DCMAKE_INSTALL_LIBDIR="${EPREFIX}/usr/$(get_libdir)/kodi" - -Wno-dev - ) - cmake_src_configure -} diff --git a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-21.4.4.ebuild b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-21.4.4.ebuild deleted file mode 100644 index 3391902..0000000 --- a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-21.4.4.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit kodi-addon - -DESCRIPTION="Kodi's Adaptive inputstream addon" -HOMEPAGE="https://github.com/xbmc/inputstream.adaptive.git" - -CODENAME="Omega" -BENTO4_VERSION="1.6.0-641-Omega" - -KEYWORDS="~amd64 ~x86" -SRC_URI="https://github.com/xbmc/inputstream.adaptive/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz - https://github.com/xbmc/Bento4/archive/${BENTO4_VERSION}.tar.gz -> bento4-${BENTO4_VERSION}.tar.gz" -S="${WORKDIR}/inputstream.adaptive-${PV}-${CODENAME}" - -LICENSE="GPL-2" -SLOT="0" -RESTRICT="!test? ( test )" -IUSE="test" - -COMMON_DEPEND=" - dev-libs/expat - dev-libs/pugixml - =media-tv/kodi-21* - " -DEPEND=" - ${COMMON_DEPEND} - test? ( dev-cpp/gtest ) - " -RDEPEND=" - ${COMMON_DEPEND} - " - -src_unpack() { - unpack ${P}.tar.gz -} - -src_configure() { - local mycmakeargs=( - -DBUILD_TESTING=$(usex test) - -DENABLE_INTERNAL_BENTO4=ON - -DBENTO4_URL="${DISTDIR}/bento4-${BENTO4_VERSION}.tar.gz" - -DCMAKE_INSTALL_LIBDIR="${EPREFIX}/usr/$(get_libdir)/kodi" - -Wno-dev - ) - cmake_src_configure -} diff --git a/media-plugins/kodi-inputstream-ffmpegdirect/Manifest b/media-plugins/kodi-inputstream-ffmpegdirect/Manifest deleted file mode 100644 index de03229..0000000 --- a/media-plugins/kodi-inputstream-ffmpegdirect/Manifest +++ /dev/null @@ -1,9 +0,0 @@ -AUX kodi-inputstream-ffmpegdirect-20.5.0-Fix-use-after-free-in-TimeshiftSegment.patch 1001 BLAKE2B ee4624253c0ab6bddd22a8ce5da969eb4e7acd22eb658eaf091fc826f714aa1314898b26a283b4e64233d4c5e5f4766a465bbbea4d4fe7b1997740a46f375d91 SHA512 608b45bf89b1430b6d25cf75f402567c1615e6457c20997efe7175aa631501eb967b5961b5dd9ff1b373de32c5d88f9a4b6da0cb92ef1866dfd81d149938e8aa -AUX kodi-inputstream-ffmpegdirect-20.5.0-Get-extradata-with-extract_extradata-BSF.patch 9834 BLAKE2B d26b4a56ddad02488868c94670440ab369a2016416a606b9f05386b615367028379279e270771d6635c69370e670178bd4dc80d4296d8ea69165b297708ded38 SHA512 77964f8d726e6bad4ea20fc9c5320f36a20047d9d9b999cc154f78e1f38612624a742c23a45ae060289e8507cc122fbd828b6f460e9449fa3e44bbc22ac61c14 -AUX kodi-inputstream-ffmpegdirect-20.5.0-ffmpeg5.patch 13078 BLAKE2B 50fa84e7790b06960177cc48a097fca12d1f984bd41db335f98e01ebd2ecca5c4fad8e917af5af8a6d8bcc3408856542d44784834fecbd119a82ee75ec243df4 SHA512 63427c395dea7533c0909cbc43fecf8e14998bb108da50a43c2e755f8fa94cdd74751ce4b09ebc8db1780eaaf1fc717f5e4ed156443f78c9fdd6fb3bf730482b -AUX kodi-inputstream-ffmpegdirect-20.5.0-ffmpeg6.patch 1467 BLAKE2B 1a82346927a978c059e0d69bde63451a5463fec0035b8f32ea735a1fd26374254aec3f4b60041f13a49993542f9244ebf232c734b4aff5c5cece0d1bdde2320f SHA512 6c385aad0afa07379235ee7bd70a11e434befabde46dd5185c90ad85258d4ac5451c8426354f4d6e1e16b4e7c6e6a267843c4abba9a2e6601677c2e7023ce9b1 -AUX kodi-inputstream-ffmpegdirect-20.5.0-gcc13.patch 1260 BLAKE2B 601ad71dfe4859e3fda621ce58f5687941e454214295514082e4f463bcc886588b83624b7afb28e204d9479c27ea9ed0bbe3b8b845716ce57cde4df164fbf8a8 SHA512 fbeaa550c562b6c29555c88108813cc6f19699506395e3efe9de54022676ebf3e6da893dde8803ea4d84f6b81563a886aac7c62ddeaab8e427d5e48dd3351eba -DIST kodi-inputstream-ffmpegdirect-20.5.0.tar.gz 289362 BLAKE2B 2e8c63bd47d54f84cade2acb092a8e3ef11c31170071f66b5f22d4aa6fd27992a22b19ecb8070ce7d952f80882fe617e5eaed70dcf325b9bdb579220ddd59688 SHA512 9db8e25f04400635e13cf7c79f7079be9c7ffbf427423abcfc449dcd06f6259dcf9ed1ad1eae1563db239978c8399e054e7c6adcbebb5cc70c4de1c01643d074 -DIST kodi-inputstream-ffmpegdirect-21.3.5.tar.gz 300657 BLAKE2B 08ec234f3a5850da080f825a842d38490dc14097f1a9bcb6c4188e0fadb3bf60bf4086c7ac89e50b4631f31f16f283babc3390f75e15ecab8aeddd45a991486c SHA512 70ea8529e93d8438a3d541d15a28bc1a445bc4e2c2c6d61174174ed6308931ab4a7e05ee32f07e58213644d4b52094bd18b479680649238702519380bddf0b26 -EBUILD kodi-inputstream-ffmpegdirect-20.5.0-r1.ebuild 1041 BLAKE2B 48e05ea76a55ee3dbd732f21f111844e072fa1588000ae9e287f1209938d5a46288f165a093e51dac7955ea8bfe348357ba2cd4ee211d29ab8ef0b3d9c5a68e2 SHA512 984c856e10cacc54b111a544ff6f2e49f21fdeca07a5473586fe58c2180bd4387e503b5acc490ade8cf0caa17d2e239854c82273860b657c0ebaaa19f7795c69 -EBUILD kodi-inputstream-ffmpegdirect-21.3.5.ebuild 796 BLAKE2B f57cd4376cd5dc2f376de831f6f8e7dce0e5dd9ff3647dd668a98649caa758bb8b7308a856ec915fd3def68f9ea05516f57bde57744bad36c8f09574f18ddcd4 SHA512 ac823b2d03f370df1c8a8af4076ebede1921c4a03191796100d3a08706b7975f99d2f9326440eeacc772b4305c5cb4ce7a63a1b2e17379eae2f25914413bbf80 diff --git a/media-plugins/kodi-inputstream-ffmpegdirect/files/kodi-inputstream-ffmpegdirect-20.5.0-Fix-use-after-free-in-TimeshiftSegment.patch b/media-plugins/kodi-inputstream-ffmpegdirect/files/kodi-inputstream-ffmpegdirect-20.5.0-Fix-use-after-free-in-TimeshiftSegment.patch deleted file mode 100644 index e7decb6..0000000 --- a/media-plugins/kodi-inputstream-ffmpegdirect/files/kodi-inputstream-ffmpegdirect-20.5.0-Fix-use-after-free-in-TimeshiftSegment.patch +++ /dev/null @@ -1,25 +0,0 @@ -From e6541a98b64631836336de17e57efa8e8e0b8425 Mon Sep 17 00:00:00 2001 -From: Vasyl Gello -Date: Sat, 15 Oct 2022 16:09:20 +0000 -Subject: [PATCH] Fix use-after-free in TimeshiftSegment - -Signed-off-by: Vasyl Gello ---- - src/stream/TimeshiftSegment.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/stream/TimeshiftSegment.cpp b/src/stream/TimeshiftSegment.cpp -index 9323a44a..9e1cd09c 100644 ---- a/src/stream/TimeshiftSegment.cpp -+++ b/src/stream/TimeshiftSegment.cpp -@@ -90,8 +90,8 @@ void TimeshiftSegment::AddPacket(DEMUX_PACKET* packet) - m_packetBuffer.emplace_back(newPacket); - - int secondsSinceStart = 0; -- if (packet->pts != STREAM_NOPTS_VALUE && packet->pts > 0) -- secondsSinceStart = packet->pts / STREAM_TIME_BASE; -+ if (newPacket->pts != STREAM_NOPTS_VALUE && newPacket->pts > 0) -+ secondsSinceStart = newPacket->pts / STREAM_TIME_BASE; - - if (secondsSinceStart != m_lastPacketSecondsSinceStart) - { diff --git a/media-plugins/kodi-inputstream-ffmpegdirect/files/kodi-inputstream-ffmpegdirect-20.5.0-Get-extradata-with-extract_extradata-BSF.patch b/media-plugins/kodi-inputstream-ffmpegdirect/files/kodi-inputstream-ffmpegdirect-20.5.0-Get-extradata-with-extract_extradata-BSF.patch deleted file mode 100644 index edc8629..0000000 --- a/media-plugins/kodi-inputstream-ffmpegdirect/files/kodi-inputstream-ffmpegdirect-20.5.0-Get-extradata-with-extract_extradata-BSF.patch +++ /dev/null @@ -1,290 +0,0 @@ -From 07ea26d7ce6bde1350ceb15380f4908da454f004 Mon Sep 17 00:00:00 2001 -From: Vasyl Gello -Date: Sat, 15 Oct 2022 16:17:48 +0000 -Subject: [PATCH] ffmpeg5: Get extradata with extract_extradata BSF - -Fixes the transport stream playback failures described in -https://bugs.debian.org/1016925 - -@Rogo95 made an excellent technical analysis of the root cause -and reported that to the bug thread. - -Later on, James Almer (@jamrial) suggested the solution to use -extract_extradata bitstream filter to replace the removed split() -function. - -Finally, I adapted the following code snippet: -https://gist.github.com/moonpfe/f6795d51294d91ee0f82f62ff6985db0 -to Kodi and tested it by playing the affected files in TS format. - -Signed-off-by: Vasyl Gello ---- - src/stream/FFmpegStream.cpp | 222 ++++++++++++++++++++++++++++++------ - src/stream/FFmpegStream.h | 2 + - 2 files changed, 192 insertions(+), 32 deletions(-) - -diff --git a/src/stream/FFmpegStream.cpp b/src/stream/FFmpegStream.cpp -index f2140a17..95d1da83 100644 ---- a/src/stream/FFmpegStream.cpp -+++ b/src/stream/FFmpegStream.cpp -@@ -29,6 +29,7 @@ - #endif - - extern "C" { -+#include - #include - #include - } -@@ -1586,6 +1587,168 @@ bool FFmpegStream::SeekTime(double time, bool backwards, double* startpts) - return false; - } - -+int FFmpegStream::GetPacketExtradata(const AVPacket* pkt, const AVCodecParserContext* parserCtx, AVCodecContext* codecCtx, uint8_t **p_extradata) -+{ -+ int extradata_size = 0; -+ -+ if (!pkt || !p_extradata) -+ return 0; -+ -+ *p_extradata = nullptr; -+ -+#if LIBAVFORMAT_BUILD >= AV_VERSION_INT(59, 0, 100) -+ /* extract_extradata bitstream filter is implemented only -+ * for certain codecs, as noted in discussion of PR#21248 -+ */ -+ -+ AVCodecID codecId = codecCtx->codec_id; -+ -+ // clang-format off -+ if ( -+ codecId != AV_CODEC_ID_MPEG1VIDEO && -+ codecId != AV_CODEC_ID_MPEG2VIDEO && -+ codecId != AV_CODEC_ID_H264 && -+ codecId != AV_CODEC_ID_HEVC && -+ codecId != AV_CODEC_ID_MPEG4 && -+ codecId != AV_CODEC_ID_VC1 && -+ codecId != AV_CODEC_ID_AV1 && -+ codecId != AV_CODEC_ID_AVS2 && -+ codecId != AV_CODEC_ID_AVS3 && -+ codecId != AV_CODEC_ID_CAVS -+ ) -+ // clang-format on -+ return 0; -+ -+ AVBSFContext *bsf = nullptr; -+ AVPacket *dst_pkt = nullptr; -+ const AVBitStreamFilter *f; -+ AVPacket *pkt_ref = nullptr; -+ int ret = 0; -+ uint8_t *ret_extradata = nullptr; -+ size_t ret_extradata_size = 0; -+ -+ f = av_bsf_get_by_name("extract_extradata"); -+ if (!f) -+ return 0; -+ -+ bsf = nullptr; -+ ret = av_bsf_alloc(f, &bsf); -+ if (ret < 0) -+ return 0; -+ -+ bsf->par_in->codec_id = codecCtx->codec_id; -+ -+ ret = av_bsf_init(bsf); -+ if (ret < 0) -+ { -+ av_bsf_free(&bsf); -+ return 0; -+ } -+ -+ dst_pkt = av_packet_alloc(); -+ pkt_ref = dst_pkt; -+ -+ ret = av_packet_ref(pkt_ref, pkt); -+ if (ret < 0) -+ { -+ av_bsf_free(&bsf); -+ av_packet_free(&dst_pkt); -+ return 0; -+ } -+ -+ ret = av_bsf_send_packet(bsf, pkt_ref); -+ if (ret < 0) -+ { -+ av_packet_unref(pkt_ref); -+ av_bsf_free(&bsf); -+ av_packet_free(&dst_pkt); -+ return 0; -+ } -+ -+ ret = 0; -+ while (ret >= 0) -+ { -+ ret = av_bsf_receive_packet(bsf, pkt_ref); -+ if (ret < 0) -+ { -+ if (ret != AVERROR(EAGAIN) && ret != AVERROR_EOF) -+ break; -+ -+ continue; -+ } -+ -+ ret_extradata = av_packet_get_side_data(pkt_ref, -+ AV_PKT_DATA_NEW_EXTRADATA, -+ &ret_extradata_size); -+ if (ret_extradata && -+ ret_extradata_size > 0 && -+ ret_extradata_size < FF_MAX_EXTRADATA_SIZE) -+ { -+ *p_extradata = (uint8_t*)av_malloc(ret_extradata_size + AV_INPUT_BUFFER_PADDING_SIZE); -+ if (!*p_extradata) -+ { -+ Log(LOGLEVEL_ERROR, -+ "%s - failed to allocate %zu bytes for extradata", -+ __FUNCTION__, -+ ret_extradata_size); -+ -+ av_packet_unref(pkt_ref); -+ av_bsf_free(&bsf); -+ av_packet_free(&dst_pkt); -+ return 0; -+ } -+ -+ Log(LOGLEVEL_DEBUG, -+ "%s - fetching extradata, extradata_size(%zu)", -+ __FUNCTION__, -+ ret_extradata_size); -+ -+ memcpy(*p_extradata, ret_extradata, ret_extradata_size); -+ memset(*p_extradata + ret_extradata_size, 0, AV_INPUT_BUFFER_PADDING_SIZE); -+ extradata_size = ret_extradata_size; -+ -+ av_packet_unref(pkt_ref); -+ break; -+ } -+ -+ av_packet_unref(pkt_ref); -+ } -+ -+ av_bsf_free(&bsf); -+ av_packet_free(&dst_pkt); -+#else -+ if (codecCtx && parserCtx && parserCtx->parser && parserCtx->parser->split) -+ extradata_size = parserCtx->parser->split(codecCtx, pkt->data, pkt->size); -+ -+ if (extradata_size <= 0 || extradata_size >= FF_MAX_EXTRADATA_SIZE) -+ { -+ Log(LOGLEVEL_DEBUG, "%s - fetched extradata of weird size %zd", -+ __FUNCTION__, extradata_size); -+ return 0; -+ } -+ -+ *p_extradata = (uint8_t*)av_malloc(extradata_size + AV_INPUT_BUFFER_PADDING_SIZE); -+ if (!*p_extradata) -+ { -+ Log(LOGLEVEL_ERROR, -+ "%s - failed to allocate %zd bytes for extradata", -+ __FUNCTION__, -+ extradata_size); -+ return 0; -+ } -+ -+ Log(LOGLEVEL_DEBUG, -+ "%s - fetching extradata, extradata_size(%zd)", -+ __FUNCTION__, -+ extradata_size); -+ -+ memcpy(*p_extradata, pkt->data, extradata_size); -+ memset(*p_extradata + extradata_size, 0, AV_INPUT_BUFFER_PADDING_SIZE); -+#endif -+ -+ return extradata_size; -+} -+ - void FFmpegStream::ParsePacket(AVPacket* pkt) - { - AVStream* st = m_pFormatContext->streams[pkt->stream_index]; -@@ -1617,43 +1780,38 @@ void FFmpegStream::ParsePacket(AVPacket* pkt) - - if (parser->second->m_parserCtx && - parser->second->m_parserCtx->parser && -- parser->second->m_parserCtx->parser->split && - !st->codecpar->extradata) - { -- int i = parser->second->m_parserCtx->parser->split(parser->second->m_codecCtx, pkt->data, pkt->size); -- if (i > 0 && i < FF_MAX_EXTRADATA_SIZE) -+ int i = GetPacketExtradata(pkt, -+ parser->second->m_parserCtx, -+ parser->second->m_codecCtx, -+ &st->codecpar->extradata); -+ if (i > 0) - { -- st->codecpar->extradata = (uint8_t*)av_malloc(i + AV_INPUT_BUFFER_PADDING_SIZE); -- if (st->codecpar->extradata) -- { -- Log(LOGLEVEL_DEBUG, "CDVDDemuxFFmpeg::ParsePacket() fetching extradata, extradata_size(%d)", i); -- st->codecpar->extradata_size = i; -- memcpy(st->codecpar->extradata, pkt->data, i); -- memset(st->codecpar->extradata + i, 0, AV_INPUT_BUFFER_PADDING_SIZE); -+ st->codecpar->extradata_size = i; - -- if (parser->second->m_parserCtx->parser->parser_parse) -+ if (parser->second->m_parserCtx->parser->parser_parse) -+ { -+ parser->second->m_codecCtx->extradata = st->codecpar->extradata; -+ parser->second->m_codecCtx->extradata_size = st->codecpar->extradata_size; -+ const uint8_t* outbufptr; -+ int bufSize; -+ parser->second->m_parserCtx->flags |= PARSER_FLAG_COMPLETE_FRAMES; -+ parser->second->m_parserCtx->parser->parser_parse(parser->second->m_parserCtx, -+ parser->second->m_codecCtx, -+ &outbufptr, &bufSize, -+ pkt->data, pkt->size); -+ parser->second->m_codecCtx->extradata = nullptr; -+ parser->second->m_codecCtx->extradata_size = 0; -+ -+ if (parser->second->m_parserCtx->width != 0) - { -- parser->second->m_codecCtx->extradata = st->codecpar->extradata; -- parser->second->m_codecCtx->extradata_size = st->codecpar->extradata_size; -- const uint8_t* outbufptr; -- int bufSize; -- parser->second->m_parserCtx->flags |= PARSER_FLAG_COMPLETE_FRAMES; -- parser->second->m_parserCtx->parser->parser_parse(parser->second->m_parserCtx, -- parser->second->m_codecCtx, -- &outbufptr, &bufSize, -- pkt->data, pkt->size); -- parser->second->m_codecCtx->extradata = nullptr; -- parser->second->m_codecCtx->extradata_size = 0; -- -- if (parser->second->m_parserCtx->width != 0) -- { -- st->codecpar->width = parser->second->m_parserCtx->width; -- st->codecpar->height = parser->second->m_parserCtx->height; -- } -- else -- { -- Log(LOGLEVEL_ERROR, "CDVDDemuxFFmpeg::ParsePacket() invalid width/height"); -- } -+ st->codecpar->width = parser->second->m_parserCtx->width; -+ st->codecpar->height = parser->second->m_parserCtx->height; -+ } -+ else -+ { -+ Log(LOGLEVEL_ERROR, "CDVDDemuxFFmpeg::ParsePacket() invalid width/height"); - } - } - } -diff --git a/src/stream/FFmpegStream.h b/src/stream/FFmpegStream.h -index 356905dd..f0634d0f 100644 ---- a/src/stream/FFmpegStream.h -+++ b/src/stream/FFmpegStream.h -@@ -109,6 +109,8 @@ class FFmpegStream - bool IsPaused() { return m_speed == STREAM_PLAYSPEED_PAUSE; } - virtual bool CheckReturnEmptyOnPacketResult(int result); - -+ int GetPacketExtradata(const AVPacket* pkt, const AVCodecParserContext* parserCtx, AVCodecContext* codecCtx, uint8_t **p_extradata); -+ - int64_t m_demuxerId; - mutable std::recursive_mutex m_mutex; - double m_currentPts; // used for stream length estimation diff --git a/media-plugins/kodi-inputstream-ffmpegdirect/files/kodi-inputstream-ffmpegdirect-20.5.0-ffmpeg5.patch b/media-plugins/kodi-inputstream-ffmpegdirect/files/kodi-inputstream-ffmpegdirect-20.5.0-ffmpeg5.patch deleted file mode 100644 index cdeae6d..0000000 --- a/media-plugins/kodi-inputstream-ffmpegdirect/files/kodi-inputstream-ffmpegdirect-20.5.0-ffmpeg5.patch +++ /dev/null @@ -1,319 +0,0 @@ -From fcad1884954ec1998f353750dd7332501e204ddb Mon Sep 17 00:00:00 2001 -From: Vasyl Gello -Date: Sat, 15 Oct 2022 16:08:14 +0000 -Subject: [PATCH] Adapt AlwinEsch's ffmpeg5 port patch - -Signed-off-by: Vasyl Gello ---- - src/stream/FFmpegStream.cpp | 96 ++++++++++++++++++++++++++++++++----- - src/stream/FFmpegStream.h | 6 ++- - src/utils/FFmpegCompat.h | 20 ++++++++ - 3 files changed, 107 insertions(+), 15 deletions(-) - create mode 100644 src/utils/FFmpegCompat.h - -diff --git a/src/stream/FFmpegStream.cpp b/src/stream/FFmpegStream.cpp -index 73e0963c..f2140a17 100644 ---- a/src/stream/FFmpegStream.cpp -+++ b/src/stream/FFmpegStream.cpp -@@ -462,7 +462,14 @@ DEMUX_PACKET* FFmpegStream::DemuxRead() - // we already check for a valid m_streams[pPacket->iStreamId] above - else if (stream->type == INPUTSTREAM_TYPE_AUDIO) - { -- if (static_cast(stream)->iChannels != m_pFormatContext->streams[pPacket->iStreamId]->codecpar->channels || -+#if LIBAVCODEC_BUILD >= AV_VERSION_INT(59, 37, 100) && \ -+ LIBAVUTIL_BUILD >= AV_VERSION_INT(57, 28, 100) -+ int codecparChannels = -+ m_pFormatContext->streams[pPacket->iStreamId]->codecpar->ch_layout.nb_channels; -+#else -+ int codecparChannels = m_pFormatContext->streams[pPacket->iStreamId]->codecpar->channels; -+#endif -+ if (static_cast(stream)->iChannels != codecparChannels || - static_cast(stream)->iSampleRate != m_pFormatContext->streams[pPacket->iStreamId]->codecpar->sample_rate) - { - // content has changed -@@ -658,7 +665,7 @@ bool FFmpegStream::Aborted() - - bool FFmpegStream::Open(bool fileinfo) - { -- AVInputFormat* iformat = NULL; -+ FFMPEG_FMT_CONST AVInputFormat* iformat = nullptr; - std::string strFile; - m_streaminfo = !m_isRealTimeStream && !m_reopen;; - m_currentPts = STREAM_NOPTS_VALUE; -@@ -729,6 +736,8 @@ bool FFmpegStream::Open(bool fileinfo) - m_streaminfo = true; - } - -+ // https://github.com/FFmpeg/FFmpeg/blob/56450a0ee4/doc/APIchanges#L18-L26 -+#if LIBAVFORMAT_BUILD < AV_VERSION_INT(59, 0, 100) - if (iformat && (strcmp(iformat->name, "mov,mp4,m4a,3gp,3g2,mj2") == 0)) - { - CURL url(m_streamUrl); -@@ -736,6 +745,7 @@ bool FFmpegStream::Open(bool fileinfo) - if (!url.GetProtocol().empty() && !url.IsProtocol("file")) - m_pFormatContext->iformat->flags |= AVFMT_NOGENSEARCH; - } -+#endif - - // we need to know if this is matroska, avi or sup later - m_bMatroska = strncmp(m_pFormatContext->iformat->name, "matroska", 8) == 0; // for "matroska.webm" -@@ -785,8 +795,11 @@ bool FFmpegStream::Open(bool fileinfo) - // if format can be nonblocking, let's use that - m_pFormatContext->flags |= AVFMT_FLAG_NONBLOCK; - -- // deprecated, will be always set in future versions -+ // https://github.com/FFmpeg/FFmpeg/blob/d682ae70b4/doc/APIchanges#L18-L21 -+#if LIBAVFORMAT_BUILD < AV_VERSION_INT(57, 66, 105) && \ -+ LIBAVCODEC_BUILD < AV_VERSION_INT(57, 83, 101) - m_pFormatContext->flags |= AVFMT_FLAG_KEEP_SIDE_DATA; -+#endif - - UpdateCurrentPTS(); - -@@ -828,12 +841,23 @@ bool FFmpegStream::Open(bool fileinfo) - { - int idx = m_pFormatContext->programs[i]->stream_index[j]; - AVStream* st = m_pFormatContext->streams[idx]; -+#if LIBAVFORMAT_BUILD >= AV_VERSION_INT(59, 3, 100) -+ // Related to https://patchwork.ffmpeg.org/project/ffmpeg/patch/20210429143825.53040-1-jamrial@gmail.com/ -+ // has been replaced with AVSTREAM_EVENT_FLAG_NEW_PACKETS. -+ if ((st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO && (st->event_flags & AVSTREAM_EVENT_FLAG_NEW_PACKETS)) || -+ (st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO && st->codecpar->sample_rate > 0)) -+ { -+ nProgram = i; -+ break; -+ } -+#else - if ((st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO && st->codec_info_nb_frames > 0) || - (st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO && st->codecpar->sample_rate > 0)) - { - nProgram = i; - break; - } -+#endif - } - } - -@@ -870,7 +894,7 @@ bool FFmpegStream::Open(bool fileinfo) - return true; - } - --bool FFmpegStream::OpenWithFFmpeg(AVInputFormat* iformat, const AVIOInterruptCB& int_cb) -+bool FFmpegStream::OpenWithFFmpeg(FFMPEG_FMT_CONST AVInputFormat* iformat, const AVIOInterruptCB& int_cb) - { - Log(LOGLEVEL_INFO, "%s - IO handled by FFmpeg's AVFormat", __FUNCTION__); - -@@ -959,7 +983,7 @@ bool FFmpegStream::OpenWithFFmpeg(AVInputFormat* iformat, const AVIOInterruptCB& - return true; - } - --bool FFmpegStream::OpenWithCURL(AVInputFormat* iformat) -+bool FFmpegStream::OpenWithCURL(FFMPEG_FMT_CONST AVInputFormat* iformat) - { - Log(LOGLEVEL_INFO, "%s - IO handled by Kodi's cURL", __FUNCTION__); - -@@ -1039,8 +1063,7 @@ bool FFmpegStream::OpenWithCURL(AVInputFormat* iformat) - // is present, we assume it is PCM audio. - // AC3 is always wrapped in iec61937 (ffmpeg "spdif"), while DTS - // may be just padded. -- AVInputFormat* iformat2; -- iformat2 = av_find_input_format("spdif"); -+ FFMPEG_FMT_CONST AVInputFormat* iformat2 = av_find_input_format("spdif"); - - if (iformat2 && iformat2->read_probe(&pd) > AVPROBE_SCORE_MAX / 4) - { -@@ -1147,11 +1170,19 @@ void FFmpegStream::UpdateCurrentPTS() - if (idx >= 0) - { - AVStream* stream = m_pFormatContext->streams[idx]; -+#if LIBAVFORMAT_BUILD >= AV_VERSION_INT(59, 3, 100) -+ if (stream && m_pkt.pkt.dts != (int64_t)AV_NOPTS_VALUE) -+ { -+ double ts = ConvertTimestamp(m_pkt.pkt.dts, stream->time_base.den, stream->time_base.num); -+ m_currentPts = ts; -+ } -+#else - if (stream && stream->cur_dts != (int64_t)AV_NOPTS_VALUE) - { - double ts = ConvertTimestamp(stream->cur_dts, stream->time_base.den, stream->time_base.num); - m_currentPts = ts; - } -+#endif - } - } - -@@ -1230,9 +1261,15 @@ bool FFmpegStream::IsProgramChange() - return true; - if (m_pFormatContext->streams[idx]->codecpar->codec_id != stream->codec) - return true; -+#if LIBAVCODEC_BUILD >= AV_VERSION_INT(59, 37, 100) && \ -+ LIBAVUTIL_BUILD >= AV_VERSION_INT(57, 28, 100) -+ int codecparChannels = -+ m_pFormatContext->streams[idx]->codecpar->ch_layout.nb_channels; -+#else -+ int codecparChannels = m_pFormatContext->streams[idx]->codecpar->channels; -+#endif - if (m_pFormatContext->streams[idx]->codecpar->codec_type == AVMEDIA_TYPE_AUDIO && -- m_pFormatContext->streams[idx]->codecpar->channels != -- static_cast(stream)->iChannels) -+ codecparChannels != static_cast(stream)->iChannels) - return true; - if (m_pFormatContext->streams[idx]->codecpar->extradata_size != static_cast(stream->ExtraSize)) - return true; -@@ -1564,7 +1601,7 @@ void FFmpegStream::ParsePacket(AVPacket* pkt) - - parser->second->m_parserCtx = av_parser_init(st->codecpar->codec_id); - -- AVCodec* codec = avcodec_find_decoder(st->codecpar->codec_id); -+ FFMPEG_FMT_CONST AVCodec* codec = avcodec_find_decoder(st->codecpar->codec_id); - if (codec == nullptr) - { - Log(LOGLEVEL_ERROR, "%s - can't find decoder", __FUNCTION__); -@@ -1641,7 +1678,11 @@ TRANSPORT_STREAM_STATE FFmpegStream::TransportStreamAudioState() - { - if (!m_startTime) - { -+#if LIBAVFORMAT_BUILD >= AV_VERSION_INT(59, 3, 100) -+ m_startTime = av_rescale(m_pkt.pkt.dts, st->time_base.num, st->time_base.den) - 0.000001; -+#else - m_startTime = av_rescale(st->cur_dts, st->time_base.num, st->time_base.den) - 0.000001; -+#endif - m_seekStream = idx; - } - return TRANSPORT_STREAM_STATE::READY; -@@ -1661,7 +1702,11 @@ TRANSPORT_STREAM_STATE FFmpegStream::TransportStreamAudioState() - { - if (!m_startTime) - { -+#if LIBAVFORMAT_BUILD >= AV_VERSION_INT(59, 3, 100) -+ m_startTime = av_rescale(m_pkt.pkt.dts, st->time_base.num, st->time_base.den) - 0.000001; -+#else - m_startTime = av_rescale(st->cur_dts, st->time_base.num, st->time_base.den) - 0.000001; -+#endif - m_seekStream = i; - } - return TRANSPORT_STREAM_STATE::READY; -@@ -1694,7 +1739,11 @@ TRANSPORT_STREAM_STATE FFmpegStream::TransportStreamVideoState() - { - if (!m_startTime) - { -+#if LIBAVFORMAT_BUILD >= AV_VERSION_INT(59, 3, 100) -+ m_startTime = av_rescale(m_pkt.pkt.dts, st->time_base.num, st->time_base.den) - 0.000001; -+#else - m_startTime = av_rescale(st->cur_dts, st->time_base.num, st->time_base.den) - 0.000001; -+#endif - m_seekStream = idx; - } - return TRANSPORT_STREAM_STATE::READY; -@@ -1714,7 +1763,11 @@ TRANSPORT_STREAM_STATE FFmpegStream::TransportStreamVideoState() - { - if (!m_startTime) - { -+#if LIBAVFORMAT_BUILD >= AV_VERSION_INT(59, 3, 100) -+ m_startTime = av_rescale(m_pkt.pkt.dts, st->time_base.num, st->time_base.den) - 0.000001; -+#else - m_startTime = av_rescale(st->cur_dts, st->time_base.num, st->time_base.den) - 0.000001; -+#endif - m_seekStream = i; - } - return TRANSPORT_STREAM_STATE::READY; -@@ -1824,14 +1877,31 @@ DemuxStream* FFmpegStream::AddStream(int streamIdx) - { - DemuxStreamAudioFFmpeg* st = new DemuxStreamAudioFFmpeg(pStream); - stream = st; -- st->iChannels = pStream->codecpar->channels; -+#if LIBAVCODEC_BUILD >= AV_VERSION_INT(59, 37, 100) && \ -+ LIBAVUTIL_BUILD >= AV_VERSION_INT(57, 28, 100) -+ int codecparChannels = pStream->codecpar->ch_layout.nb_channels; -+ int codecparChannelLayout = pStream->codecpar->ch_layout.u.mask; -+#else -+ int codecparChannels = pStream->codecpar->channels; -+ int codecparChannelLayout = pStream->codecpar->channel_layout; -+#endif -+ st->iChannels = codecparChannels; -+ st->iChannelLayout = codecparChannelLayout; - st->iSampleRate = pStream->codecpar->sample_rate; - st->iBlockAlign = pStream->codecpar->block_align; - st->iBitRate = static_cast(pStream->codecpar->bit_rate); - st->iBitsPerSample = pStream->codecpar->bits_per_raw_sample; -- st->iChannelLayout = pStream->codecpar->channel_layout; - char buf[32] = { 0 }; -+ // https://github.com/FFmpeg/FFmpeg/blob/6ccc3989d15/doc/APIchanges#L50-L53 -+#if LIBAVCODEC_BUILD >= AV_VERSION_INT(59, 37, 100) && \ -+ LIBAVUTIL_BUILD >= AV_VERSION_INT(57, 28, 100) -+ AVChannelLayout layout = {}; -+ av_channel_layout_from_mask(&layout, st->iChannelLayout); -+ av_channel_layout_describe(&layout, buf, sizeof(buf)); -+ av_channel_layout_uninit(&layout); -+#else - av_get_channel_layout_string(buf, 31, st->iChannels, st->iChannelLayout); -+#endif - st->m_channelLayoutName = buf; - if (st->iBitsPerSample == 0) - st->iBitsPerSample = pStream->codecpar->bits_per_coded_sample; -@@ -2070,7 +2140,7 @@ std::string FFmpegStream::GetStreamCodecName(int iStreamId) - return strName; - } - -- AVCodec* codec = avcodec_find_decoder(stream->codec); -+ FFMPEG_FMT_CONST AVCodec* codec = avcodec_find_decoder(stream->codec); - if (codec) - strName = codec->name; - } -diff --git a/src/stream/FFmpegStream.h b/src/stream/FFmpegStream.h -index bf8a50f9..356905dd 100644 ---- a/src/stream/FFmpegStream.h -+++ b/src/stream/FFmpegStream.h -@@ -7,6 +7,7 @@ - - #pragma once - -+#include "../utils/FFmpegCompat.h" - #include "../utils/HttpProxy.h" - #include "../utils/Properties.h" - #include "BaseStream.h" -@@ -33,6 +34,7 @@ extern "C" - #include - #include - #include -+#include - } - - #ifndef __GNUC__ -@@ -117,8 +119,8 @@ class FFmpegStream - - private: - bool Open(bool fileinfo); -- bool OpenWithFFmpeg(AVInputFormat* iformat, const AVIOInterruptCB& int_cb); -- bool OpenWithCURL(AVInputFormat* iformat); -+ bool OpenWithFFmpeg(FFMPEG_FMT_CONST AVInputFormat* iformat, const AVIOInterruptCB& int_cb); -+ bool OpenWithCURL(FFMPEG_FMT_CONST AVInputFormat* iformat); - AVDictionary* GetFFMpegOptionsFromInput(); - void ResetVideoStreams(); - double ConvertTimestamp(int64_t pts, int den, int num); -diff --git a/src/utils/FFmpegCompat.h b/src/utils/FFmpegCompat.h -new file mode 100644 -index 00000000..46cff53f ---- /dev/null -+++ b/src/utils/FFmpegCompat.h -@@ -0,0 +1,20 @@ -+/* -+ * Copyright (C) 2005-2022 Team Kodi -+ * This file is part of Kodi - https://kodi.tv -+ * -+ * SPDX-License-Identifier: GPL-2.0-or-later -+ * See LICENSES/README.md for more information. -+ */ -+ -+#pragma once -+ -+extern "C" { -+#include -+} -+ -+// https://github.com/FFmpeg/FFmpeg/blob/56450a0ee4/doc/APIchanges#L18-L26 -+#if LIBAVFORMAT_BUILD >= AV_VERSION_INT(59, 0, 100) -+#define FFMPEG_FMT_CONST const -+#else -+#define FFMPEG_FMT_CONST -+#endif diff --git a/media-plugins/kodi-inputstream-ffmpegdirect/files/kodi-inputstream-ffmpegdirect-20.5.0-ffmpeg6.patch b/media-plugins/kodi-inputstream-ffmpegdirect/files/kodi-inputstream-ffmpegdirect-20.5.0-ffmpeg6.patch deleted file mode 100644 index ce3b820..0000000 --- a/media-plugins/kodi-inputstream-ffmpegdirect/files/kodi-inputstream-ffmpegdirect-20.5.0-ffmpeg6.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 98ccdd2f4263eb1590c65f175c11deeec18fe6c2 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Fri, 3 Mar 2023 19:33:04 +0100 -Subject: [PATCH] Fix build with ffmpeg 6.0 - -This feature was removed from ffmpeg: -http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=add33e370d241d947209c914de1bf062fe44d58e ---- - src/stream/FFmpegStream.cpp | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/src/stream/FFmpegStream.cpp b/src/stream/FFmpegStream.cpp -index 341062ed..0996b446 100644 ---- a/src/stream/FFmpegStream.cpp -+++ b/src/stream/FFmpegStream.cpp -@@ -920,7 +920,6 @@ bool FFmpegStream::OpenWithFFmpeg(const AVInputFormat* iformat, const AVIOInterr - // We only process this condition for manifest streams when this setting is disabled - if (!kodi::addon::GetSettingBoolean("useFastOpenForManifestStreams") || m_manifestType.empty()) - { -- m_pFormatContext->flags |= AVFMT_FLAG_PRIV_OPT; - if (avformat_open_input(&m_pFormatContext, strFile.c_str(), iformat, &options) < 0) - { - Log(LOGLEVEL_DEBUG, "Error, could not open file %s", CURL::GetRedacted(strFile).c_str()); -@@ -935,7 +934,6 @@ bool FFmpegStream::OpenWithFFmpeg(const AVInputFormat* iformat, const AVIOInterr - } - - m_pFormatContext->interrupt_callback = int_cb; -- m_pFormatContext->flags &= ~AVFMT_FLAG_PRIV_OPT; - options = GetFFMpegOptionsFromInput(); - av_dict_set_int(&options, "load_all_variants", 0, AV_OPT_SEARCH_CHILDREN); - diff --git a/media-plugins/kodi-inputstream-ffmpegdirect/files/kodi-inputstream-ffmpegdirect-20.5.0-gcc13.patch b/media-plugins/kodi-inputstream-ffmpegdirect/files/kodi-inputstream-ffmpegdirect-20.5.0-gcc13.patch deleted file mode 100644 index 51e7d14..0000000 --- a/media-plugins/kodi-inputstream-ffmpegdirect/files/kodi-inputstream-ffmpegdirect-20.5.0-gcc13.patch +++ /dev/null @@ -1,47 +0,0 @@ -From fd7bd5ad86fd0006ad571a051fa5d5603a47e4b4 Mon Sep 17 00:00:00 2001 -From: Rudi Heitbaum -Date: Wed, 26 Apr 2023 17:15:00 +0000 -Subject: [PATCH] include missing to support gcc-13 - -gcc 13 moved some includes around and as a result is no longer transitively -included [1]. Explicitly include it for uint{32,64}_t. - -[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes - -Signed-off-by: Rudi Heitbaum ---- - src/utils/DiskUtils.h | 1 + - src/utils/HttpProxy.h | 3 ++- - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/utils/DiskUtils.h b/src/utils/DiskUtils.h -index 79e34268..f900ec58 100644 ---- a/src/utils/DiskUtils.h -+++ b/src/utils/DiskUtils.h -@@ -7,6 +7,7 @@ - - #pragma once - -+#include - #include - - namespace ffmpegdirect -diff --git a/src/utils/HttpProxy.h b/src/utils/HttpProxy.h -index eb0c99cb..d203ce36 100644 ---- a/src/utils/HttpProxy.h -+++ b/src/utils/HttpProxy.h -@@ -7,6 +7,7 @@ - - #pragma once - -+#include - #include - - namespace ffmpegdirect -@@ -36,4 +37,4 @@ namespace ffmpegdirect - std::string m_user; - std::string m_password; - }; --} //namespace ffmpegdirect -\ No newline at end of file -+} //namespace ffmpegdirect diff --git a/media-plugins/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect-20.5.0-r1.ebuild b/media-plugins/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect-20.5.0-r1.ebuild deleted file mode 100644 index 6cf97a1..0000000 --- a/media-plugins/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect-20.5.0-r1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit kodi-addon - -DESCRIPTION="Kodi's FFMpeg Direct Inputstream addon" -HOMEPAGE="https://github.com/xbmc/inputstream.ffmpegdirect" -SRC_URI="" - -KEYWORDS="~amd64 ~arm ~arm64 ~x86" -CODENAME="Nexus" -SRC_URI="https://github.com/xbmc/inputstream.ffmpegdirect/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/inputstream.ffmpegdirect-${PV}-${CODENAME}" - -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -BDEPEND=" - virtual/pkgconfig - " - -COMMON_DEPEND=" - media-video/ffmpeg:=[encode,libxml2,zlib] - virtual/libiconv - app-arch/bzip2 - =media-tv/kodi-20* - " - -DEPEND=" - ${COMMON_DEPEND} - " - -RDEPEND=" - ${COMMON_DEPEND} - " - -PATCHES=( - "${FILESDIR}"/${P}-ffmpeg5.patch - "${FILESDIR}"/${P}-Get-extradata-with-extract_extradata-BSF.patch - "${FILESDIR}"/${P}-Fix-use-after-free-in-TimeshiftSegment.patch - "${FILESDIR}"/${P}-ffmpeg6.patch - "${FILESDIR}"/${P}-gcc13.patch -) - -src_prepare() { - [ -d depends ] && rm -rf depends || die - cmake_src_prepare -} diff --git a/media-plugins/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect-21.3.5.ebuild b/media-plugins/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect-21.3.5.ebuild deleted file mode 100644 index be51708..0000000 --- a/media-plugins/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect-21.3.5.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit kodi-addon - -DESCRIPTION="Kodi's FFMpeg Direct Inputstream addon" -HOMEPAGE="https://github.com/xbmc/inputstream.ffmpegdirect" -SRC_URI="" - -KEYWORDS="~amd64 ~arm ~arm64 ~x86" -CODENAME="Omega" -SRC_URI="https://github.com/xbmc/inputstream.ffmpegdirect/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/inputstream.ffmpegdirect-${PV}-${CODENAME}" - -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -BDEPEND=" - virtual/pkgconfig - " - -COMMON_DEPEND=" - media-video/ffmpeg:=[encode,libxml2,zlib] - virtual/libiconv - app-arch/bzip2 - =media-tv/kodi-21* - " - -DEPEND=" - ${COMMON_DEPEND} - " - -RDEPEND=" - ${COMMON_DEPEND} - " - -src_prepare() { - [ -d depends ] && rm -rf depends || die - cmake_src_prepare -} diff --git a/media-plugins/kodi-inputstream-rtmp/Manifest b/media-plugins/kodi-inputstream-rtmp/Manifest deleted file mode 100644 index 5126e81..0000000 --- a/media-plugins/kodi-inputstream-rtmp/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST kodi-inputstream-rtmp-20.3.0.tar.gz 88703 BLAKE2B 226ffca80634a05bfd7be268f7a024c5f9d54e9c561da213fe53a3369e7657fa92549e3a5107899d9304d382997bf502092fe21f09e6e013858b0de2828caaef SHA512 4c70d3df184eae19e359460560257012fece6cbd571d9a27c01f0dbdff84f1ce12b88527a1797cdc3c2a12e39edb92a7a82dd1cfd5721b553290a295733df9f6 -DIST kodi-inputstream-rtmp-21.1.0.tar.gz 88737 BLAKE2B ca06e97078a162a197bc4be70d192359ee43afbba1421efb4eecaefc2f233acfc99ee32bf4c1203e6cc94f789208d51dcdb1c36c2839227e651239bd524791b3 SHA512 a386974b2efbded5f17837aa78cbc8d7b8c8a4073099ab99567d6af121f0f193331af8d671fb24edfd156106b65f0f9e983bac5dd93b360cb8d4eb4b1e179e16 -EBUILD kodi-inputstream-rtmp-20.3.0.ebuild 707 BLAKE2B cfc25e400f0e2c57af86328e264a4a58da308c1ae0fa361006ca7db76b5c4fc13c23ed41f84b868b6d693ce6eac2b67031a6ea8a9ac3379c16565d363ab55dfc SHA512 a2bf3a5d40678eca20f25ec3603ad66e00bdc3a0255c01c34dc209b59160ecfedceb394025e6b667ca8b173602acbf9e5be318f056b65c9d524946cf3a6189f8 -EBUILD kodi-inputstream-rtmp-21.1.0.ebuild 707 BLAKE2B 5ac134f60e037184a991fac171f0334316abfbc2a84f8b7ca040724993ba0c08b31bdddb933e1bda50672266ce2a9f75aeae05be98e52c8fb3b5e360505183e1 SHA512 1118f92ea35d08afdcb7e0bd046da78e66f7c85475d6bf6cb07c2d960dc65b3471604bdfbc4319b6a71ab2f08bc141aa2fe8a057741c72abb03e1c938ce1e42b diff --git a/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-20.3.0.ebuild b/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-20.3.0.ebuild deleted file mode 100644 index 87af120..0000000 --- a/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-20.3.0.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit kodi-addon - -DESCRIPTION="Kodi's RTMP inputstream addon" -HOMEPAGE="https://github.com/xbmc/inputstream.rtmp" -KODI_PLUGIN_NAME="inputstream.rtmp" - -CODENAME="Nexus" -KEYWORDS="~amd64 ~x86" -SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}" -DEPEND="=media-tv/kodi-20*:=" - -LICENSE="GPL-2+" -SLOT="0" -IUSE="" - -DEPEND+=" - media-video/rtmpdump[ssl] - " - -RDEPEND="${DEPEND}" - -BDEPEND="virtual/pkgconfig" - -src_prepare() { - if [ -d depends ]; then rm -rf depends || die; fi - - cmake_src_prepare -} diff --git a/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-21.1.0.ebuild b/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-21.1.0.ebuild deleted file mode 100644 index 055374c..0000000 --- a/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-21.1.0.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit kodi-addon - -DESCRIPTION="Kodi's RTMP inputstream addon" -HOMEPAGE="https://github.com/xbmc/inputstream.rtmp" -KODI_PLUGIN_NAME="inputstream.rtmp" - -CODENAME="Omega" -KEYWORDS="~amd64 ~x86" -SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}" -DEPEND="=media-tv/kodi-21*:=" - -LICENSE="GPL-2+" -SLOT="0" -IUSE="" - -DEPEND+=" - media-video/rtmpdump[ssl] - " - -RDEPEND="${DEPEND}" - -BDEPEND="virtual/pkgconfig" - -src_prepare() { - if [ -d depends ]; then rm -rf depends || die; fi - - cmake_src_prepare -} diff --git a/media-plugins/kodi-peripheral-joystick/Manifest b/media-plugins/kodi-peripheral-joystick/Manifest deleted file mode 100644 index fa3ed67..0000000 --- a/media-plugins/kodi-peripheral-joystick/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST kodi-peripheral-joystick-20.1.0.tar.gz 126103 BLAKE2B ead6450b2e44bf3ba7c907553541d10fdd118fc0f01ac63931d69e5674b1c709c6e5e23ddb0d808482eb9986eb42e67ef2a5cfb23e549f02b74d76ad4ed0a359 SHA512 c5016f74bee316e5b25686420125397cb1840de72be4e9a11390a1338ad920b93d2e8cf36e845feb82aba826a425152dcb621a9ef1b6aea6259d9423283957d9 -EBUILD kodi-peripheral-joystick-20.1.0.ebuild 736 BLAKE2B 6204c5ae5d0f7797988b69528c45830eacb118f1633f861cc36742fc658871fe85ca6d76b71b1875c755a8c09116fd02c20e097e0fa176a454a2d282620a8b9c SHA512 5c08136c117c400aaa36ff3ae755176929c749d2d3b16debc216550bf0bcd12125b2ab1599fd426ff47d201aaa3c7eab333334785b7e6e2cd35e84d6f474e3d7 diff --git a/media-plugins/kodi-peripheral-joystick/kodi-peripheral-joystick-20.1.0.ebuild b/media-plugins/kodi-peripheral-joystick/kodi-peripheral-joystick-20.1.0.ebuild deleted file mode 100644 index 72dbec2..0000000 --- a/media-plugins/kodi-peripheral-joystick/kodi-peripheral-joystick-20.1.0.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit kodi-addon - -DESCRIPTION="Libretro compatibility layer for the Kodi Game API" -HOMEPAGE="https://github.com/xbmc/peripheral.joystick" -SRC_URI="" - -case ${PV} in -9999) - SRC_URI="" - EGIT_BRANCH="Nexus" - EGIT_REPO_URI="https://github.com/xbmc/peripheral.joystick.git" - inherit git-r3 - ;; -*) - KEYWORDS="~amd64 ~x86" - CODENAME="Nexus" - SRC_URI="https://github.com/xbmc/peripheral.joystick/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/peripheral.joystick-${PV}-${CODENAME}" - ;; -esac - -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -DEPEND=" - =media-tv/kodi-20* - dev-libs/libpcre - dev-libs/tinyxml - " -RDEPEND=" - ${DEPEND} - " diff --git a/media-plugins/kodi-pvr-hts/Manifest b/media-plugins/kodi-pvr-hts/Manifest deleted file mode 100644 index 73c8495..0000000 --- a/media-plugins/kodi-pvr-hts/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST kodi-pvr-hts-20.7.2.tar.gz 218776 BLAKE2B e09b9462f9b8913b1e156c2fa966170e4f59b5d6a88b5694159027006e22ce610a9217eae345f41752a81083a450b3f466db685e03231ae30ffd26884b21675b SHA512 ef16355ff0a9e00a44717ab5216bd88d9a63e745f656694dace73e35437b945034ae852cf1415c04ebab7c1bb102a8cf8b913c7fc8bce49237aa7c3c96c2f290 -DIST kodi-pvr-hts-21.2.1.tar.gz 217080 BLAKE2B 7d8bde3b074a8187b538c28e955c86bb0372b6af38e8d36fca9ab61e347f236a2085b731c6764cd28665cc6f571e20d138af39089d5c1b6513178c18e93515d1 SHA512 d7bd128d1b804f5bba7de52c95c879c7fff15bd7f1082514e6f0b1867a46dc05fcd91ea2a2bfae4bd4d0aa788a46ecfbaf9011f2cec87a18e633dfc1c8a0249e -EBUILD kodi-pvr-hts-20.7.2.ebuild 533 BLAKE2B 9c6f56c6036c07e269e73df302b56bb2e154e4d9cd84ac75358e4d2b1bba14bbb585d07e32cb70453c132b48c2cf6923acf50638fc369e14ab038e2890ce2074 SHA512 7698aef6dcb69f0d64bc8f63e73357b92987d6ad20ae3007e1de7c410b02874fbf59fd878127e3695a23ebf16cbe74977e8c9cad2bf45fd7edfb46e55feb857b -EBUILD kodi-pvr-hts-21.2.1.ebuild 533 BLAKE2B a9a25b30392a7b004a808bab449bf6fda6aad42c80d3188032b194580f763549264f0ac641dc7f174fa5e726352489c15429664a050406aa2ca44442de8902e9 SHA512 3b0d626dfdbddc414c65aef5e133fc91600e7a9495c525c4e71a68ef6b86bf3aec1db29591176ac6a37a40204c08e66e61a99160c433a160b3778f60c30ac251 diff --git a/media-plugins/kodi-pvr-hts/kodi-pvr-hts-20.7.2.ebuild b/media-plugins/kodi-pvr-hts/kodi-pvr-hts-20.7.2.ebuild deleted file mode 100644 index 46865c5..0000000 --- a/media-plugins/kodi-pvr-hts/kodi-pvr-hts-20.7.2.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake kodi-addon - -DESCRIPTION="Tvheadend Live TV and Radio PVR client addon for Kodi" -HOMEPAGE="https://github.com/kodi-pvr/pvr.hts" -SRC_URI="" - -CODENAME="Nexus" -KEYWORDS="~amd64 ~x86" -SRC_URI="https://github.com/kodi-pvr/pvr.hts/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/pvr.hts-${PV}-${CODENAME}" - -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -DEPEND=" - =media-tv/kodi-20* - " - -RDEPEND=" - ${DEPEND} - " diff --git a/media-plugins/kodi-pvr-hts/kodi-pvr-hts-21.2.1.ebuild b/media-plugins/kodi-pvr-hts/kodi-pvr-hts-21.2.1.ebuild deleted file mode 100644 index 6b78d76..0000000 --- a/media-plugins/kodi-pvr-hts/kodi-pvr-hts-21.2.1.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake kodi-addon - -DESCRIPTION="Tvheadend Live TV and Radio PVR client addon for Kodi" -HOMEPAGE="https://github.com/kodi-pvr/pvr.hts" -SRC_URI="" - -CODENAME="Omega" -KEYWORDS="~amd64 ~x86" -SRC_URI="https://github.com/kodi-pvr/pvr.hts/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/pvr.hts-${PV}-${CODENAME}" - -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -DEPEND=" - =media-tv/kodi-21* - " - -RDEPEND=" - ${DEPEND} - " diff --git a/media-plugins/kodi-pvr-iptvsimple/Manifest b/media-plugins/kodi-pvr-iptvsimple/Manifest deleted file mode 100644 index d8ff0db..0000000 --- a/media-plugins/kodi-pvr-iptvsimple/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST kodi-pvr-iptvsimple-20.13.0.tar.gz 793075 BLAKE2B abc758f09bd876f6c2395b9a7ec1fdd3a847da85ab87daca667e0c2678545749421db3dc6b4b9b5f6c9e6b309cae6e4acbc4bb0f32075fcc8f4d270b4cd156a1 SHA512 970e264b79309190f3d89386c79cd6e48ddfa2c51f25b7c513b2a5454671e03726b669fe846e55acdaab3e7157d2de078416dd11cc5a1ed1d599b49525f5e63d -DIST kodi-pvr-iptvsimple-21.8.3.tar.gz 378116 BLAKE2B b16e7ccd5f8b8b9f2635eb891673ac5b93ad1b43b54351ca29b7670562365f67d6fc4d4d635ed8f9494e013b3235bb36516fc08155bdcfb01941896af99cd4bb SHA512 f19ab8e91b6e270c96f8e3912139ba6109893131eb78a38c5b35cac58f9d8bfb7672d1dcce73343432d5552d1bb5cba4cd6943971893929748da7e7e78eb2c77 -EBUILD kodi-pvr-iptvsimple-20.13.0.ebuild 639 BLAKE2B 8ee50b2277fd9d857899616c52605fec50ad01158e8c6513884777ad21733f1d6b6f09ab4d28c2c41854a58a14f5441cf251f391360b40ef97dbfa31ab7e71f5 SHA512 76476aa2260ea187f7a67f3bb7e8bff6e754f7738a1ea4720f080eaa9b82b280631d095966338f7c8f944da0761c86e6d2e47a33acc7768716a2113322e82821 -EBUILD kodi-pvr-iptvsimple-21.8.3.ebuild 639 BLAKE2B 579d53e9a186bab886f945aca1e1214f5f014becfe4a4275eebc8d829ecce2ecab9edb8c1d6c88cd81ba6deefc12a1de7102bbb68754344420c9b3bc00fe28fb SHA512 a77faa08be34738daa84596e1756d8c38ddca8d5ddaece021d4b7f8e0df56d1b4de17cf845fedd9594399d41796c2586727e076bc02f497e2975a7ac96462717 diff --git a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-20.13.0.ebuild b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-20.13.0.ebuild deleted file mode 100644 index 4ce8f4a..0000000 --- a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-20.13.0.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake kodi-addon - -DESCRIPTION="Kodi's IPTVSimple client addon" -HOMEPAGE="https://github.com/kodi-pvr/pvr.iptvsimple" -SRC_URI="" - - -CODENAME="Nexus" -KEYWORDS="~amd64 ~x86" -SRC_URI="https://github.com/kodi-pvr/pvr.iptvsimple/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/pvr.iptvsimple-${PV}-${CODENAME}" - -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -DEPEND=" - dev-libs/pugixml - =media-tv/kodi-20* - sys-libs/zlib - " - -RDEPEND=" - ${DEPEND} - " - -src_prepare() { - [ -d depends ] && rm -rf depends || die - cmake_src_prepare -} diff --git a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-21.8.3.ebuild b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-21.8.3.ebuild deleted file mode 100644 index 5396ce3..0000000 --- a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-21.8.3.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake kodi-addon - -DESCRIPTION="Kodi's IPTVSimple client addon" -HOMEPAGE="https://github.com/kodi-pvr/pvr.iptvsimple" -SRC_URI="" - - -CODENAME="Omega" -KEYWORDS="~amd64 ~x86" -SRC_URI="https://github.com/kodi-pvr/pvr.iptvsimple/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/pvr.iptvsimple-${PV}-${CODENAME}" - -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -DEPEND=" - dev-libs/pugixml - =media-tv/kodi-21* - sys-libs/zlib - " - -RDEPEND=" - ${DEPEND} - " - -src_prepare() { - [ -d depends ] && rm -rf depends || die - cmake_src_prepare -} diff --git a/media-plugins/kodi-vfs-sftp/Manifest b/media-plugins/kodi-vfs-sftp/Manifest deleted file mode 100644 index 3b815de..0000000 --- a/media-plugins/kodi-vfs-sftp/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST kodi-vfs-sftp-20.1.0.tar.gz 45904 BLAKE2B f9c0f4359075609122627fbec2c945d643a844d7cb07eb09d7ab1581856a2c46790a36398e414ba9ef03c4b36eb361f2ea5a5a23aef980a83a8e6124e1b19f52 SHA512 ea2b205a5b4f279f8211a5744d0f5e6efb6346052ba927aef95733e1c964df5b97fc1176e2fa5d2b378561464f868cdc37e564ca120079f6ff70d2e79b48667c -DIST kodi-vfs-sftp-21.0.0_pre240219.tar.gz 46169 BLAKE2B 539a2dc8ee1a6b042c75b1e860c0e7c1b82d5eba1d23677baad98400125a94959a1b1e585cea5e6879826a6b9e67634bbcb661bbb03a40aeb95c3ce355aa46af SHA512 64370da865e07fec5e91a31a924469f9b217a733cd6209d014231d75fe4eff46e0b77099589c24b97de5591251ce2521be61b5e57ad47ea916d6baa4cf18bdf8 -EBUILD kodi-vfs-sftp-20.1.0.ebuild 584 BLAKE2B 4393f5a510a214c2b13d8266656e33bfafa5b7a82dc1d1b1a193cea9ba797cb09968b757f2a06ed3087e8209ab23c6f9062d064d93b3351563927f58f767b474 SHA512 8cc26519db1d83c8241004f5b4d7af04f8f7ba9dca4e7b3100df368ddcfca7531a539626a3882c41599a146c868128d0c4d20c8aab327b09889c2b651a4ffc14 -EBUILD kodi-vfs-sftp-21.0.0_pre240219.ebuild 617 BLAKE2B 8c7d07a514c914357c4834d04aadf892aa4fdf496492ca068c5e38f1a46f08bce7699be3feb36a737dff26a34436cb94a2278d2f35e891714c432ade581edb7c SHA512 b8c587473f862af1ef841a9aaf5adaeacc76f57dc95eb7940ecbe33e063ef17b247925f4600a3fa2192be1ea084236a1d2e3a8395daf4ab1e114c4553baa92ac diff --git a/media-plugins/kodi-vfs-sftp/kodi-vfs-sftp-20.1.0.ebuild b/media-plugins/kodi-vfs-sftp/kodi-vfs-sftp-20.1.0.ebuild deleted file mode 100644 index 5a840e4..0000000 --- a/media-plugins/kodi-vfs-sftp/kodi-vfs-sftp-20.1.0.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit kodi-addon - -DESCRIPTION="SFTP VFS addon for Kodi" -HOMEPAGE="https://github.com/xbmc/vfs.sftp" -SRC_URI="" - -CODENAME="Nexus" -KEYWORDS="~amd64 ~x86" -SRC_URI="https://github.com/xbmc/vfs.sftp/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/vfs.sftp-${PV}-${CODENAME}" - -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -DEPEND=" - net-libs/libssh[sftp] - =media-tv/kodi-20* - " -RDEPEND="${DEPEND}" - -src_prepare() { - [ -d depends ] && rm -rf depends || die - cmake_src_prepare -} diff --git a/media-plugins/kodi-vfs-sftp/kodi-vfs-sftp-21.0.0_pre240219.ebuild b/media-plugins/kodi-vfs-sftp/kodi-vfs-sftp-21.0.0_pre240219.ebuild deleted file mode 100644 index e6b2cd9..0000000 --- a/media-plugins/kodi-vfs-sftp/kodi-vfs-sftp-21.0.0_pre240219.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit kodi-addon - -COMMIT_ID="9fe870e71a10a37f2d793b2261bac48b195f2705" - -DESCRIPTION="SFTP VFS addon for Kodi" -HOMEPAGE="https://github.com/xbmc/vfs.sftp" - -CODENAME="Omega" -KEYWORDS="~amd64 ~x86" -SRC_URI="https://github.com/xbmc/vfs.sftp/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/vfs.sftp-${COMMIT_ID}" - -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -DEPEND=" - net-libs/libssh[sftp] - =media-tv/kodi-21* - " -RDEPEND="${DEPEND}" - -src_prepare() { - [ -d depends ] && rm -rf depends || die - cmake_src_prepare -}