From 0f558761aa2dee1017b4751e4017205e015a9560 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 29 Jun 2022 12:04:12 +0100 Subject: gentoo resync : 29.12.2022 --- media-video/subtitlecomposer/Manifest | 3 +- .../files/subtitlecomposer-0.7.1-ffmpeg-5.patch | 65 ++++++++++++++++++++++ .../subtitlecomposer/subtitlecomposer-0.7.1.ebuild | 1 + 3 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-ffmpeg-5.patch (limited to 'media-video/subtitlecomposer') diff --git a/media-video/subtitlecomposer/Manifest b/media-video/subtitlecomposer/Manifest index 215234fce96c..5429eb3717ea 100644 --- a/media-video/subtitlecomposer/Manifest +++ b/media-video/subtitlecomposer/Manifest @@ -1,5 +1,6 @@ +AUX subtitlecomposer-0.7.1-ffmpeg-5.patch 2218 BLAKE2B 5ceb17db99f0fa8579ef072365c801f7dfb5b6980386237473ebe44f9b43e7a58f0d1940bdf0bb29652624ea501f40e8b37fec27b6fa68afd161e60a800f9819 SHA512 fa310d2219cf114626c90ad1ce909f1865004321bb4b31692f7dc2c3f4707e0c3ace3df9f4b31263454c5b3c72682667588829f9ec0f7b58565fd3cfc120495c AUX subtitlecomposer-0.7.1-gles-support.patch 4291 BLAKE2B fe5e39720c89f6bed7cf66f23b793b53823f588e188f9e0487e8fd7ab034915da712944cfae79a5be090d810c77ade183291e09cb98777d2ebcae6bd28f28943 SHA512 f02a103eb61b8e2b02375d4b15939d836b53181365c79a3100f6c14d62c8b17598d169191ab400a57031fcbc922d62695692908564e4cc85c2a42f3a09cc69a4 AUX subtitlecomposer-0.7.1-tests-optional.patch 762 BLAKE2B cc8f7408e165422788ed9f6c3641e816237ef1230e64853ceb0fe83acbbe9a10b3cd2b5670270904984ab3e23ebfe6ea1d07278826a6ab89346ec7502076f477 SHA512 a02f847164f2f117f024c09311b00a55b268f80089c6304b29ffd5bb7166ea3b81c14e65befc36379124f18600cb6d57ae8f320261ecd25bb0e05c754d55cbcb DIST subtitlecomposer-0.7.1.tar.xz 636808 BLAKE2B 4c71277c9646a64d59a0cd6923084b39292916e9edf154c026a051253fe8aabab1bdfb9e10c6fab5eb0d754ba428567c2259c637915e93d8d391b7f247c6dc79 SHA512 b486a1be8b414409af4ec2d2ccc86a7e9f34040f114b0efbbf817b5157d85b5f9a37d80272b468a389128f10c12316bf028dd86e2a7434a2b001bfd185208b92 -EBUILD subtitlecomposer-0.7.1.ebuild 1503 BLAKE2B 137faa2e750391323816982db54cd03bf88562e3ae09a28ad71a0756fa532be15a8583684e1eb5ee8603b7acb2a6a0cf14d7d01c1db6a15dcb6e52482e24f74b SHA512 466f47a9c43405b54350ff6b2665fb787666f1b421430a3f9c5fcd569ef8598e611c2b2a9f4b30741fe1b79254eb0adbd34d1d6e4f21db4d3f60571d28f4bf73 +EBUILD subtitlecomposer-0.7.1.ebuild 1551 BLAKE2B f7e1457573720a3d6a0636be0529707ef5a2525dfbe30551988774cb2d3df2dc97c4721df3d50abc645a3f5c1fbb0a801a588f7bc66550301f717607a0f8db0e SHA512 d6f972f6286bab6d1e30b3371d71fd389573ad2ea2e78346bbae0d7c76418cb83d4df09f9fc5680526f50ce1178766d40932e9c01bda8d696cf20266a9a7a0be MISC metadata.xml 438 BLAKE2B b11cde969ef9af83c7e70ac17615703c8f0b4296113a8ff552a669c3b7bf7b5291106dd1c4ece993fd8195f5af3bcd1b05697b583bd85f4a155fa10351cbbadd SHA512 d32994646bdbfb90e5fde722a905ebf5fa59903de7c36fd8228ce257057ac8523d7219656d1f1a1bdcc3f0eec1ad9f34535d4090078c9e3a6890d58b8e1e3b71 diff --git a/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-ffmpeg-5.patch b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-ffmpeg-5.patch new file mode 100644 index 000000000000..a0314fb06820 --- /dev/null +++ b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-ffmpeg-5.patch @@ -0,0 +1,65 @@ +From 4f4f560e40ba0b760cf688eb024be3cc734ca347 Mon Sep 17 00:00:00 2001 +From: Mladen Milinkovic +Date: Tue, 25 Jan 2022 14:01:56 +0100 +Subject: [PATCH] Fix compilation with ffmpeg5 #63 + +--- + src/streamprocessor/streamprocessor.cpp | 2 +- + src/videoplayer/backend/decoder.h | 1 + + src/videoplayer/backend/framequeue.h | 1 + + src/videoplayer/backend/streamdemuxer.cpp | 2 +- + 4 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/streamprocessor/streamprocessor.cpp b/src/streamprocessor/streamprocessor.cpp +index b86795e..8faf8a2 100644 +--- a/src/streamprocessor/streamprocessor.cpp ++++ b/src/streamprocessor/streamprocessor.cpp +@@ -195,7 +195,7 @@ StreamProcessor::findStream(int streamType, int streamIndex, bool imageSub) + int ret; + char errorText[1024]; + +- AVCodec *dec = avcodec_find_decoder(m_avStream->codecpar->codec_id); ++ const AVCodec *dec = avcodec_find_decoder(m_avStream->codecpar->codec_id); + if(!dec) { + qWarning() << "Failed to find decoder for stream" << i; + return false; +diff --git a/src/videoplayer/backend/decoder.h b/src/videoplayer/backend/decoder.h +index 4ab95b2..fb6840d 100644 +--- a/src/videoplayer/backend/decoder.h ++++ b/src/videoplayer/backend/decoder.h +@@ -11,6 +11,7 @@ + #include + + extern "C" { ++#include "libavcodec/avcodec.h" + #include "libavformat/avformat.h" + } + +diff --git a/src/videoplayer/backend/framequeue.h b/src/videoplayer/backend/framequeue.h +index dc9b2fa..ece1166 100644 +--- a/src/videoplayer/backend/framequeue.h ++++ b/src/videoplayer/backend/framequeue.h +@@ -9,6 +9,7 @@ + #define FRAMEQUEUE_H + + extern "C" { ++#include "libavcodec/avcodec.h" + #include "libavformat/avformat.h" + } + +diff --git a/src/videoplayer/backend/streamdemuxer.cpp b/src/videoplayer/backend/streamdemuxer.cpp +index 1e339b3..e8320ea 100644 +--- a/src/videoplayer/backend/streamdemuxer.cpp ++++ b/src/videoplayer/backend/streamdemuxer.cpp +@@ -230,7 +230,7 @@ StreamDemuxer::componentOpen(int streamIndex) + { + AVFormatContext *ic = m_vs->fmtContext; + AVCodecContext *avCtx; +- AVCodec *codec; ++ const AVCodec *codec; + AVDictionary *opts = nullptr; + AVDictionaryEntry *t = nullptr; + int sampleRate, nbChannels; +-- +GitLab + diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.7.1.ebuild b/media-video/subtitlecomposer/subtitlecomposer-0.7.1.ebuild index 3ff7e5e962a5..54143eba37a9 100644 --- a/media-video/subtitlecomposer/subtitlecomposer-0.7.1.ebuild +++ b/media-video/subtitlecomposer/subtitlecomposer-0.7.1.ebuild @@ -46,6 +46,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}/${P}-tests-optional.patch" "${FILESDIR}/${P}-gles-support.patch" # bug 820035 + "${FILESDIR}/${P}-ffmpeg-5.patch" # bug 834416 ) src_configure() { -- cgit v1.2.3