diff options
| author | Oscar Cowdery Lack | 2023-03-10 09:55:07 +1100 |
|---|---|---|
| committer | Oscar Cowdery Lack | 2023-03-10 09:55:07 +1100 |
| commit | aef66ccdca99a8619c1c949159abc8e9178d19cb (patch) | |
| tree | 34f88d441dd6ec28af9ec98e4355ee645a20405e | |
| parent | 95f402eb3805e5e55b4e815e1d9caec7fc0f1814 (diff) | |
| download | aur-aef66ccdca99a8619c1c949159abc8e9178d19cb.tar.gz | |
2.3.3-9
- Compat with ffmpeg 6.0
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 5 | ||||
| -rw-r--r-- | ffmpeg-6.0.patch | 13 |
3 files changed, 20 insertions, 2 deletions
@@ -1,7 +1,7 @@ pkgbase = casparcg-server pkgdesc = Software used to play out professional graphics, audio and video to multiple outputs pkgver = 2.3.3 - pkgrel = 8 + pkgrel = 9 url = https://github.com/CasparCG/server arch = x86_64 license = GPL3 @@ -40,6 +40,7 @@ pkgbase = casparcg-server source = https://patch-diff.githubusercontent.com/raw/CasparCG/server/pull/1465.patch source = https://patch-diff.githubusercontent.com/raw/CasparCG/server/pull/1466.patch source = ffmpeg-5.0.patch + source = ffmpeg-6.0.patch source = missing-includes.patch source = ffmpeg-cmake.patch source = https://cef-builds.spotifycdn.com/cef_binary_3.3578.1870.gc974488_linux64_minimal.tar.bz2 @@ -61,6 +62,7 @@ pkgbase = casparcg-server sha256sums = fb6f4412629b4d1a149b7913c152857489394118a61b5925d4cc0dbf2c9c63d7 sha256sums = ab1091e19cd1d3948be3ca80f5a8f2718b60ead3e63ad35dcff9246f95160791 sha256sums = 74258b79273b852209f03c826cd64879514929cd222fa03c924b71444c9110a1 + sha256sums = 856b943416759e011bcbf11bf82151e1afa2417ece3586ceda6cb30bf21980a9 sha256sums = 62f98bbf454b04d99df0b385a81dc902c3b8faf2c245ebded69e8597da793717 sha256sums = e7f0e0dd123b1cccac21611f4e32ba7d27ce24a9a0587ef6f2180fb3c63894c0 sha256sums = b7c5401f342917ece7be583566bfc48b5cc1a8ff9f6470d396130b4aca7dfb22 @@ -3,7 +3,7 @@ pkgname=casparcg-server pkgver=2.3.3 _pkgver=$pkgver-lts-stable _cef_version=3.3578.1870.gc974488 -pkgrel=8 +pkgrel=9 pkgdesc="Software used to play out professional graphics, audio and video to multiple outputs" arch=('x86_64') url="https://github.com/CasparCG/server" @@ -28,6 +28,8 @@ source=("https://github.com/CasparCG/server/archive/refs/tags/v$_pkgver.tar.gz" "https://patch-diff.githubusercontent.com/raw/CasparCG/server/pull/1466.patch" # included upstream, but doesn't apply cleaning to 2.3.3 "ffmpeg-5.0.patch" + # made obsolete by upstream changes + "ffmpeg-6.0.patch" # included upstream, but in larger commits that we don't want to backport "missing-includes.patch" "ffmpeg-cmake.patch" @@ -50,6 +52,7 @@ sha256sums=('6d8e973949009e95bb5a6496e26cbe680efd77666936e131df0da569f8f7c7e1' 'fb6f4412629b4d1a149b7913c152857489394118a61b5925d4cc0dbf2c9c63d7' 'ab1091e19cd1d3948be3ca80f5a8f2718b60ead3e63ad35dcff9246f95160791' '74258b79273b852209f03c826cd64879514929cd222fa03c924b71444c9110a1' + '856b943416759e011bcbf11bf82151e1afa2417ece3586ceda6cb30bf21980a9' '62f98bbf454b04d99df0b385a81dc902c3b8faf2c245ebded69e8597da793717' 'e7f0e0dd123b1cccac21611f4e32ba7d27ce24a9a0587ef6f2180fb3c63894c0' 'b7c5401f342917ece7be583566bfc48b5cc1a8ff9f6470d396130b4aca7dfb22' diff --git a/ffmpeg-6.0.patch b/ffmpeg-6.0.patch new file mode 100644 index 000000000000..d6cc20a8fe64 --- /dev/null +++ b/ffmpeg-6.0.patch @@ -0,0 +1,13 @@ +diff --git a/src/modules/ffmpeg/producer/av_producer.cpp b/src/modules/ffmpeg/producer/av_producer.cpp +index e20eb6703..7d3d71045 100644 +--- a/src/modules/ffmpeg/producer/av_producer.cpp ++++ b/src/modules/ffmpeg/producer/av_producer.cpp +@@ -104,7 +104,7 @@ struct Decoder + FF(avcodec_parameters_to_context(ctx.get(), stream->codecpar)); + + int numThreads = 1; +- if (codec->capabilities & AV_CODEC_CAP_AUTO_THREADS) { ++ if (codec->capabilities & AV_CODEC_CAP_FRAME_THREADS) { + numThreads = 0; + } else if (codec->capabilities & AV_CODEC_CAP_SLICE_THREADS) { + numThreads = std::min<int>(8, std::thread::hardware_concurrency() / 2); |