Date: Sunday, April 24, 2022 @ 13:31:12 Author: heftig Revision: 443906
1.22.0-1 Modified: openal/trunk/PKGBUILD Deleted: openal/trunk/ffmpeg-5.0.diff -----------------+ PKGBUILD | 25 +++++++++---------------- ffmpeg-5.0.diff | 13 ------------- 2 files changed, 9 insertions(+), 29 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-04-24 13:25:35 UTC (rev 443905) +++ PKGBUILD 2022-04-24 13:31:12 UTC (rev 443906) @@ -4,23 +4,22 @@ pkgbase=openal pkgname=(openal openal-examples) -pkgver=1.21.1 -pkgrel=3 +pkgver=1.22.0 +pkgrel=1 pkgdesc="Cross-platform 3D audio library, software implementation" arch=(x86_64) url="https://github.com/kcat/openal-soft"; license=(LGPL) depends=(gcc-libs) -makedepends=(alsa-lib libpulse fluidsynth portaudio jack qt5-base sdl2 +makedepends=(alsa-lib libpulse fluidsynth portaudio jack pipewire qt5-base sdl2 libsndfile ffmpeg libmysofa git cmake ninja) optdepends=('qt5-base: alsoft-config GUI Configurator' 'fluidsynth: MIDI rendering' 'libmysofa: makemhr tool') -_commit=ae4eacf147e2c2340cc4e02a790df04c793ed0a9 # tags/1.21.1 -source=("git+https://github.com/kcat/openal-soft#commit=$_commit"; - ffmpeg-5.0.diff) -sha512sums=('SKIP' - '9a2bcc2036799d4ca9d98845b75b4ae03d9f300e4e7ddf20f7b52239e625d3b064728cd48c5dc36862ae63d0a26ecd994aa4a1594b0ff45c93d226a1fe023337') +options=(debug) +_commit=c1c63a27de66cd44ef756b190a73bfa8bc6dbbab # master +source=("git+https://github.com/kcat/openal-soft#commit=$_commit";) +b2sums=('SKIP') pkgver() { cd openal-soft @@ -30,14 +29,8 @@ prepare() { cd openal-soft - # Missing include - git cherry-pick -n 302e88dbf0f10224a5b87be4ce43b3fdd9d20184 - - # https://bugs.archlinux.org/task/72729 - git cherry-pick -n b7ff1de48efda9ad54e6a3b4c1526722c371e832 - - # Fix build with FFmpeg 5.0 - git apply -3 ../ffmpeg-5.0.diff + # Fixup missing tag + git tag -f 1.22.0 c1c63a27de66cd44ef756b190a73bfa8bc6dbbab } build() { Deleted: ffmpeg-5.0.diff =================================================================== --- ffmpeg-5.0.diff 2022-04-24 13:25:35 UTC (rev 443905) +++ ffmpeg-5.0.diff 2022-04-24 13:31:12 UTC (rev 443906) @@ -1,13 +0,0 @@ -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)
