Date: Friday, March 3, 2023 @ 19:43:56 Author: arojas Revision: 1411076
upgpkg: jami-daemon 20220722-7: FFmpeg 6 rebuild Added: jami-daemon/trunk/ffmpeg6.patch Modified: jami-daemon/trunk/PKGBUILD ---------------+ PKGBUILD | 11 ++++++++--- ffmpeg6.patch | 12 ++++++++++++ 2 files changed, 20 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2023-03-03 19:43:45 UTC (rev 1411075) +++ PKGBUILD 2023-03-03 19:43:56 UTC (rev 1411076) @@ -3,7 +3,7 @@ pkgname=jami-daemon pkgver=20220722 -pkgrel=6 +pkgrel=7 pkgdesc="Free and universal communication platform which preserves the users’ privacy and freedoms (daemon component)" arch=(x86_64) url="https://jami.net"; @@ -18,9 +18,12 @@ _commit=6f64b069a1c95a15b744d4044ad3d8032147439f _pjprojectver=4af5d666d18837abaac94c8ec6bfc84984dcf1e2 source=(git+https://git.jami.net/savoirfairelinux/${pkgname}.git#commit=${_commit} - https://github.com/savoirfairelinux/pjproject/archive/${_pjprojectver}/pjproject-${_pjprojectver}.tar.gz) + https://github.com/savoirfairelinux/pjproject/archive/${_pjprojectver}/pjproject-${_pjprojectver}.tar.gz + ffmpeg6.patch) noextract=(pjproject-${_pjprojectver}.tar.gz) -sha512sums=(SKIP 3113daca372c84beda1f9f9a1b73f02ba7d565bb1d40662cc30bf741ec0ffda4e7d69034521073ce12f80498c071166a67959531e39abb865ea8d1e48564677f) +sha512sums=('SKIP' + '3113daca372c84beda1f9f9a1b73f02ba7d565bb1d40662cc30bf741ec0ffda4e7d69034521073ce12f80498c071166a67959531e39abb865ea8d1e48564677f' + 'e0b68771eab0a8d86651520025fbf57f4b9614b4e9e06fe50b415313e5e52f7a49b3660030fc50550ebcb03c21c7d10c9eb948c3c753f2c35b237cffd4d0561f') pkgver() { cd ${pkgname} @@ -31,6 +34,8 @@ cd ${pkgname} cp ../pjproject-${_pjprojectver}.tar.gz contrib/tarballs mkdir contrib/native + + patch -p1 -i ../ffmpeg6.patch # Fix build with FFmpeg 6 } build() { Added: ffmpeg6.patch =================================================================== --- ffmpeg6.patch (rev 0) +++ ffmpeg6.patch 2023-03-03 19:43:56 UTC (rev 1411076) @@ -0,0 +1,12 @@ +diff --git a/src/media/video/accel.cpp b/src/media/video/accel.cpp +index 344bfbd00..bf206e39c 100644 +--- a/src/media/video/accel.cpp ++++ b/src/media/video/accel.cpp +@@ -313,7 +313,6 @@ HardwareAccel::setDetails(AVCodecContext* codecCtx) + if (type_ == CODEC_DECODER) { + codecCtx->hw_device_ctx = av_buffer_ref(deviceCtx_); + codecCtx->get_format = getFormatCb; +- codecCtx->thread_safe_callbacks = 1; + } else if (type_ == CODEC_ENCODER) { + if (framesCtx_) + // encoder doesn't need a device context, only a frame context
