Date: Friday, April 21, 2023 @ 11:03:18
Author: arojas
Revision: 1448121
archrelease: copy trunk to community-x86_64
Added:
jami-daemon/repos/community-x86_64/PKGBUILD
(from rev 1448120, jami-daemon/trunk/PKGBUILD)
Deleted:
jami-daemon/repos/community-x86_64/PKGBUILD
jami-daemon/repos/community-x86_64/ffmpeg6.patch
---------------+
PKGBUILD | 126 +++++++++++++++++++++++++++-----------------------------
ffmpeg6.patch | 12 -----
2 files changed, 62 insertions(+), 76 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2023-04-21 11:03:06 UTC (rev 1448120)
+++ PKGBUILD 2023-04-21 11:03:18 UTC (rev 1448121)
@@ -1,64 +0,0 @@
-# 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-x86_64/PKGBUILD (from rev 1448120,
jami-daemon/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2023-04-21 11:03:18 UTC (rev 1448121)
@@ -0,0 +1,62 @@
+# Maintainer: Bruno Pagani <[email protected]>
+# Contributor: Baptiste Jonglez <baptiste--aur at jonglez dot org>
+
+pkgname=jami-daemon
+pkgver=20230323
+pkgrel=1
+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=c5bbd21e1c125f4012e2f88f485816a438ae62a7
+_pjprojectver=e4b83585a0bdf1523e808a4fc1946ec82ac733d0
+source=(git+https://git.jami.net/savoirfairelinux/${pkgname}.git#commit=${_commit}
+
https://github.com/savoirfairelinux/pjproject/archive/${_pjprojectver}/pjproject-${_pjprojectver}.tar.gz)
+noextract=(pjproject-${_pjprojectver}.tar.gz)
+sha512sums=('SKIP'
+
'617f3a5cd38423a429b17553bb73ad467694ce3e899a788aaf20d0540f6a6904c06a2fc35bf9e0d1c9ab07ba821ca0e1d6d2b002e473bfa9850ff6f8b96447c0')
+
+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
+
+ git cherry-pick -n 315b5fbf546712f22a7b03ca750257bc92263a91 # Support
opendht 2.5
+}
+
+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}"
+}
Deleted: ffmpeg6.patch
===================================================================
--- ffmpeg6.patch 2023-04-21 11:03:06 UTC (rev 1448120)
+++ ffmpeg6.patch 2023-04-21 11:03:18 UTC (rev 1448121)
@@ -1,12 +0,0 @@
-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
