Date: Saturday, March 18, 2023 @ 18:57:26
Author: jelle
Revision: 1423026
archrelease: copy trunk to community-staging-x86_64
Added:
jami-daemon/repos/community-staging-x86_64/
jami-daemon/repos/community-staging-x86_64/PKGBUILD
(from rev 1423024, jami-daemon/trunk/PKGBUILD)
jami-daemon/repos/community-staging-x86_64/ffmpeg6.patch
(from rev 1423024, jami-daemon/trunk/ffmpeg6.patch)
---------------+
PKGBUILD | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
ffmpeg6.patch | 12 ++++++++++
2 files changed, 76 insertions(+)
Copied: jami-daemon/repos/community-staging-x86_64/PKGBUILD (from rev 1423024,
jami-daemon/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2023-03-18 18:57:26 UTC (rev 1423026)
@@ -0,0 +1,64 @@
+# Maintainer: Bruno Pagani <[email protected]>
+# Contributor: Baptiste Jonglez <baptiste--aur at jonglez dot org>
+
+pkgname=jami-daemon
+pkgver=20220722
+pkgrel=8
+pkgdesc="Free and universal communication platform which preserves the users’
privacy and freedoms (daemon component)"
+arch=(x86_64)
+url="https://jami.net";
+license=(GPL3)
+groups=(jami)
+depends=(glibc opendht gnutls nettle libgit2 libsecp256k1 ffmpeg speexdsp
+ fmt yaml-cpp jsoncpp zlib alsa-lib libpulse jack libupnp libnatpmp
+ openssl webrtc-audio-processing systemd-libs libarchive)
+# portaudio needs a not-yet-upstream patch
https://git.jami.net/savoirfairelinux/jami-daemon/-/issues/650
+makedepends=(git cmake perl asio msgpack-c msgpack-cxx restinio systemd meson)
+checkdepends=(cppunit)
+_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
+ ffmpeg6.patch)
+noextract=(pjproject-${_pjprojectver}.tar.gz)
+sha512sums=('SKIP'
+
'3113daca372c84beda1f9f9a1b73f02ba7d565bb1d40662cc30bf741ec0ffda4e7d69034521073ce12f80498c071166a67959531e39abb865ea8d1e48564677f'
+
'e0b68771eab0a8d86651520025fbf57f4b9614b4e9e06fe50b415313e5e52f7a49b3660030fc50550ebcb03c21c7d10c9eb948c3c753f2c35b237cffd4d0561f')
+
+pkgver() {
+ cd ${pkgname}
+ TZ=UTC git show -s --pretty=%cd --date=format-local:%Y%m%d HEAD
+}
+
+prepare() {
+ cd ${pkgname}
+ cp ../pjproject-${_pjprojectver}.tar.gz contrib/tarballs
+ mkdir contrib/native
+
+ patch -p1 -i ../ffmpeg6.patch # Fix build with FFmpeg 6
+}
+
+build() {
+ cd ${pkgname}/contrib/native
+ export CXXFLAGS+=' -fpermissive'
+ ../bootstrap \
+ --disable-downloads \
+ --disable-all \
+ --enable-pjproject
+ make DEPS_pjproject=
+
+ cd "${srcdir}"
+ arch-meson ${pkgname} build -D interfaces=library -D opensl=disabled -D
portaudio=disabled \
+ $( ((CHECKFUNC)) && echo -D tests=true) \
+ -D
pkg_config_path="${PWD}/${pkgname}/contrib/$(cc -dumpmachine)/lib/pkgconfig"
+ meson compile -C build
+}
+
+#check() {
+# https://git.jami.net/savoirfairelinux/jami-daemon/-/issues/649
+# meson test -C build --print-errorlogs
+#}
+
+package() {
+ meson install -C build --destdir "${pkgdir}"
+}
Copied: jami-daemon/repos/community-staging-x86_64/ffmpeg6.patch (from rev
1423024, jami-daemon/trunk/ffmpeg6.patch)
===================================================================
--- community-staging-x86_64/ffmpeg6.patch (rev 0)
+++ community-staging-x86_64/ffmpeg6.patch 2023-03-18 18:57:26 UTC (rev
1423026)
@@ -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
