Date: Sunday, January 23, 2022 @ 23:20:39 Author: heftig Revision: 435023
1.21.1-3: ffmpeg rebuild Added: openal/trunk/ffmpeg-5.0.diff Modified: openal/trunk/PKGBUILD -----------------+ PKGBUILD | 11 ++++++++--- ffmpeg-5.0.diff | 13 +++++++++++++ 2 files changed, 21 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-01-23 23:20:35 UTC (rev 435022) +++ PKGBUILD 2022-01-23 23:20:39 UTC (rev 435023) @@ -5,7 +5,7 @@ pkgbase=openal pkgname=(openal openal-examples) pkgver=1.21.1 -pkgrel=2 +pkgrel=3 pkgdesc="Cross-platform 3D audio library, software implementation" arch=(x86_64) url="https://github.com/kcat/openal-soft"; @@ -17,8 +17,10 @@ 'fluidsynth: MIDI rendering' 'libmysofa: makemhr tool') _commit=ae4eacf147e2c2340cc4e02a790df04c793ed0a9 # tags/1.21.1 -source=("git+https://github.com/kcat/openal-soft#commit=$_commit";) -sha512sums=('SKIP') +source=("git+https://github.com/kcat/openal-soft#commit=$_commit"; + ffmpeg-5.0.diff) +sha512sums=('SKIP' + '9a2bcc2036799d4ca9d98845b75b4ae03d9f300e4e7ddf20f7b52239e625d3b064728cd48c5dc36862ae63d0a26ecd994aa4a1594b0ff45c93d226a1fe023337') pkgver() { cd openal-soft @@ -33,6 +35,9 @@ # https://bugs.archlinux.org/task/72729 git cherry-pick -n b7ff1de48efda9ad54e6a3b4c1526722c371e832 + + # Fix build with FFmpeg 5.0 + git apply -3 ../ffmpeg-5.0.diff } build() { Added: ffmpeg-5.0.diff =================================================================== --- ffmpeg-5.0.diff (rev 0) +++ ffmpeg-5.0.diff 2022-01-23 23:20:39 UTC (rev 435023) @@ -0,0 +1,13 @@ +diff --git i/examples/alffplay.cpp w/examples/alffplay.cpp +index b9739e7b..806ef10c 100644 +--- i/examples/alffplay.cpp ++++ w/examples/alffplay.cpp +@@ -1804,7 +1804,7 @@ int MovieState::streamComponentOpen(unsigned int stream_index) + if(avcodec_parameters_to_context(avctx.get(), mFormatCtx->streams[stream_index]->codecpar)) + return -1; + +- AVCodec *codec{avcodec_find_decoder(avctx->codec_id)}; ++ const AVCodec *codec{avcodec_find_decoder(avctx->codec_id)}; + if(!codec || avcodec_open2(avctx.get(), codec, nullptr) < 0) + { + std::cerr<< "Unsupported codec: "<<avcodec_get_name(avctx->codec_id)
