From 22899eb46c1c332d9a8a995c0be0b965fb1bcfc3 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 25 Jul 2022 14:56:29 +0100 Subject: gentoo auto-resync : 25:07:2022 - 14:56:29 --- kde-apps/ffmpegthumbs/Manifest | 3 -- kde-apps/ffmpegthumbs/ffmpegthumbs-21.12.3.ebuild | 33 ---------------------- .../files/ffmpegthumbs-21.12.3-ffmpeg5.patch | 28 ------------------ 3 files changed, 64 deletions(-) delete mode 100644 kde-apps/ffmpegthumbs/ffmpegthumbs-21.12.3.ebuild delete mode 100644 kde-apps/ffmpegthumbs/files/ffmpegthumbs-21.12.3-ffmpeg5.patch (limited to 'kde-apps/ffmpegthumbs') diff --git a/kde-apps/ffmpegthumbs/Manifest b/kde-apps/ffmpegthumbs/Manifest index 9b9891a6fad9..3aac4684a4a1 100644 --- a/kde-apps/ffmpegthumbs/Manifest +++ b/kde-apps/ffmpegthumbs/Manifest @@ -1,6 +1,3 @@ -AUX ffmpegthumbs-21.12.3-ffmpeg5.patch 913 BLAKE2B 1ba9898b2b19690233ef489afa9877fed59561707423bf43194e9d2b7d87ebfa7b8dbbe26f67d9286e99250958b9d7b4dcad765dd5cf44e29c37b87aae5fec7f SHA512 613221e9b7c27fdf695dd7eb4c5bf9e4e821fe92da341f1d2bc87147ca840e2769faa9410dd52e85e348a313a9c05ed606bf03407abc229de5dc5a0fc45fa155 -DIST ffmpegthumbs-21.12.3.tar.xz 29944 BLAKE2B e0b9aa6af80f75d644fc8ea1c3ea87cb82fc14feaba2c2140cf2842cddba2fc677f96ce1efacd545cb0e8445204a0d2226ce6ed2957268accd54b4981140fb2b SHA512 93ad5c9adcc9bf22c45266eefadb0c2c65bd75e64767b50db9ad1adc7edd55f640a3a0263e59c938d0a3433bd3fca8e0ff9c4b9f9a2f59ad2be09ad126770d12 DIST ffmpegthumbs-22.04.3.tar.xz 30388 BLAKE2B 8142781e1fd91142c5f8727ab8ca0096c7be9ce5dd39b5b0cfd67b46f651ffeb03b398626793dd1ff27d89670fc843a4feb84cb43a72d06a7104819135cb7dcc SHA512 fbb7583adf96e46b2b8f60953b5a0af538e00efec14a78161906f87cb46868788d348d8a3cb5d8e2f7260949147c4ff400d3d1918fc8a087c8085d4ea33cf83a -EBUILD ffmpegthumbs-21.12.3.ebuild 719 BLAKE2B 71cd96ed3b43278f9e3f56118b0a2c4079b95f78078096c9ac57b43942bbd03500904006cfd9bcecf07dce5811a4118b0a1755e92bf795e962db14693504ae76 SHA512 77860d5f6efb2a1521f65d6d4beac7c412899ef754703f173c796b8fbafa54025f799321679303872b74083097cbdb09a330649a4bfae15bddd2943552aed969 EBUILD ffmpegthumbs-22.04.3.ebuild 572 BLAKE2B 2dd584e1889263b817cb66c844e47808add17d1da5ee0f1ce1259e3d7ce4742700921f2a84fe4dee45a727f2e227860340d7199bc52f8abf0e18ef9a7d819023 SHA512 d99397191381d9de6cb731f5609545b499825aa39bb0cfbc1aaaef4cfb3a18433622cb5be7196cce985ed297a0d3265b5f9d23f9ec45742732d628b0d266bd62 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6 diff --git a/kde-apps/ffmpegthumbs/ffmpegthumbs-21.12.3.ebuild b/kde-apps/ffmpegthumbs/ffmpegthumbs-21.12.3.ebuild deleted file mode 100644 index 084cdf2a5810..000000000000 --- a/kde-apps/ffmpegthumbs/ffmpegthumbs-21.12.3.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KFMIN=5.88.0 -QTMIN=5.15.2 -inherit ecm kde.org - -DESCRIPTION="FFmpeg based thumbnail generator for video files" - -LICENSE="GPL-2+" -SLOT="5" -KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86" -IUSE="" - -BDEPEND=" - virtual/pkgconfig -" -DEPEND=" - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - media-libs/taglib - media-video/ffmpeg:0= -" -RDEPEND="${DEPEND}" - -# Upstream pending MR: -# https://invent.kde.org/multimedia/ffmpegthumbs/-/merge_requests/16 -PATCHES=( "${FILESDIR}/${P}-ffmpeg5.patch" ) # bug #831480 diff --git a/kde-apps/ffmpegthumbs/files/ffmpegthumbs-21.12.3-ffmpeg5.patch b/kde-apps/ffmpegthumbs/files/ffmpegthumbs-21.12.3-ffmpeg5.patch deleted file mode 100644 index 62322154eefb..000000000000 --- a/kde-apps/ffmpegthumbs/files/ffmpegthumbs-21.12.3-ffmpeg5.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 8c9491775a5af072bfbcf1a2fdfc1f016d1333cf Mon Sep 17 00:00:00 2001 -From: Antonio Rojas -Date: Tue, 25 Jan 2022 12:53:45 +0100 -Subject: [PATCH] Fix build with FFmpeg 5 - ---- - ffmpegthumbnailer/moviedecoder.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/ffmpegthumbnailer/moviedecoder.h b/ffmpegthumbnailer/moviedecoder.h -index 502abe9..03eb6dd 100644 ---- a/ffmpegthumbnailer/moviedecoder.h -+++ b/ffmpegthumbnailer/moviedecoder.h -@@ -57,7 +57,11 @@ private: - int m_VideoStream; - AVFormatContext* m_pFormatContext; - AVCodecContext* m_pVideoCodecContext; -+#if LIBAVCODEC_VERSION_MAJOR < 59 - AVCodec* m_pVideoCodec; -+#else -+ const AVCodec* m_pVideoCodec; -+#endif - AVStream* m_pVideoStream; - AVFrame* m_pFrame; - quint8* m_pFrameBuffer; --- -GitLab - -- cgit v1.2.3