diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-03-20 00:40:44 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-03-20 00:40:44 +0000 |
| commit | 4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch) | |
| tree | 356496503d52354aa6d9f2d36126302fed5f3a73 /kde-apps/ffmpegthumbs | |
| parent | fcc5224904648a8e6eb528d7603154160a20022f (diff) | |
gentoo resync : 20.03.2022
Diffstat (limited to 'kde-apps/ffmpegthumbs')
| -rw-r--r-- | kde-apps/ffmpegthumbs/Manifest | 5 | ||||
| -rw-r--r-- | kde-apps/ffmpegthumbs/ffmpegthumbs-21.12.3.ebuild (renamed from kde-apps/ffmpegthumbs/ffmpegthumbs-21.12.1.ebuild) | 4 | ||||
| -rw-r--r-- | kde-apps/ffmpegthumbs/files/ffmpegthumbs-21.12.3-ffmpeg5.patch | 28 |
3 files changed, 35 insertions, 2 deletions
diff --git a/kde-apps/ffmpegthumbs/Manifest b/kde-apps/ffmpegthumbs/Manifest index 9951c87a4f9b..e5fbce5d7bb3 100644 --- a/kde-apps/ffmpegthumbs/Manifest +++ b/kde-apps/ffmpegthumbs/Manifest @@ -1,5 +1,6 @@ +AUX ffmpegthumbs-21.12.3-ffmpeg5.patch 913 BLAKE2B 1ba9898b2b19690233ef489afa9877fed59561707423bf43194e9d2b7d87ebfa7b8dbbe26f67d9286e99250958b9d7b4dcad765dd5cf44e29c37b87aae5fec7f SHA512 613221e9b7c27fdf695dd7eb4c5bf9e4e821fe92da341f1d2bc87147ca840e2769faa9410dd52e85e348a313a9c05ed606bf03407abc229de5dc5a0fc45fa155 DIST ffmpegthumbs-21.08.3.tar.xz 36996 BLAKE2B 0c0f214ebe3a420afbf486de08916bddfe752199bd01ff11f2ca346ca40fde41bf6704b9d05ab35b03c92a3c689d8de8adadd524222c0d6ddbbb0c2da79ed771 SHA512 b1e232f0ab9f0acdca6307fa0167ab64b2eea97725bea81ab1fdb12a14c3ac3001b2906ce289afc00a7a6bf26b7c905cfa14afc62e5bd0ff45edcc94f1c70996 -DIST ffmpegthumbs-21.12.1.tar.xz 29956 BLAKE2B 915a1bfb096e01bf8cb9dd2d9354618bdd41e04e4d73d4f0a5423dc90031f4a5af9bbbc8be8adf63d567189b6e8d93fc335b087cc3c93e1ba10047b316803bd3 SHA512 6185ce655d3d66bd961c0d35e4301ce4da328d95df809eb2b08628bdbb792a77fad98a8f651bd3a93a951ba00177e25517013314abc44170bbfca3ec32389fc0 +DIST ffmpegthumbs-21.12.3.tar.xz 29944 BLAKE2B e0b9aa6af80f75d644fc8ea1c3ea87cb82fc14feaba2c2140cf2842cddba2fc677f96ce1efacd545cb0e8445204a0d2226ce6ed2957268accd54b4981140fb2b SHA512 93ad5c9adcc9bf22c45266eefadb0c2c65bd75e64767b50db9ad1adc7edd55f640a3a0263e59c938d0a3433bd3fca8e0ff9c4b9f9a2f59ad2be09ad126770d12 EBUILD ffmpegthumbs-21.08.3.ebuild 567 BLAKE2B f90758159b1adaba34dc66d030b4c23b8cd22cb116ca88688493f0727318088ccaf7c4f0f53bebb2d286e47494bd6b9b0b5ca9d293ee9d4b8b6e0d74f80571f5 SHA512 6dafac8202ebe04a4986ceb641867e3e60f0bf20f133a98d7454720714cc0858f5a67bc9018beb25eac6458e9aa2409f7fbc3ee1a5bd11e49bd24bede2776545 -EBUILD ffmpegthumbs-21.12.1.ebuild 570 BLAKE2B 34ecd7929763bad63201bb7a247f592456e9cdc6c7698ab59244622e39a76b85ba837d6122adb21f32705df1561bb04008b79e1ed2817679ed78c7f3d766a9a6 SHA512 ad574eb90c66f9e431c245d699c18ba2077f91a16685977f4932ed3fee315f2c8e09a441ef9bc083206ade1eb98d4c47bf4778fe22f0c616297e469607b981cc +EBUILD ffmpegthumbs-21.12.3.ebuild 722 BLAKE2B d368c7068d28d3f65c3ea907679fc1099d533995714fdd64f2b6ac5bc033841df3fdbd04d1ae951b1bbeaa2e775b51fcf53f69ead6f8360b2f960350df652b58 SHA512 7e9d25b2697fbc6f498b66f70e9a1d801eb692f18d8dc7e4106ed6f71f2e69cd919aedb81c7d31c9bdeb2faef3689d204d7ceb09470060493c527710888636eb MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6 diff --git a/kde-apps/ffmpegthumbs/ffmpegthumbs-21.12.1.ebuild b/kde-apps/ffmpegthumbs/ffmpegthumbs-21.12.3.ebuild index e3f805e2feb0..0743bc755665 100644 --- a/kde-apps/ffmpegthumbs/ffmpegthumbs-21.12.1.ebuild +++ b/kde-apps/ffmpegthumbs/ffmpegthumbs-21.12.3.ebuild @@ -27,3 +27,7 @@ DEPEND=" 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 new file mode 100644 index 000000000000..62322154eefb --- /dev/null +++ b/kde-apps/ffmpegthumbs/files/ffmpegthumbs-21.12.3-ffmpeg5.patch @@ -0,0 +1,28 @@ +From 8c9491775a5af072bfbcf1a2fdfc1f016d1333cf Mon Sep 17 00:00:00 2001 +From: Antonio Rojas <arojas@archlinux.org> +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 + |