From 2f1ebdd4c9d7448566a103c4ef14eb78e02c0c16 Mon Sep 17 00:00:00 2001
From: Amin Bandali <amin.bandali@savoirfairelinux.com>
Date: Wed, 16 Mar 2022 14:28:55 -0400
Subject: [PATCH] packaging: build bundled ffmpeg for libclient and client-qt
Recent libclient and client-qt use avframe from ffmpeg's libavutil.
Change-Id: Ia860e374eb2b8d6c22a79ee0f5a22673a292bf19
---
packaging/rules/rpm/jami-libclient.spec | 17 +++++++++++++++++
packaging/rules/rpm/jami-qt.spec | 17 +++++++++++++++++
2 files changed, 34 insertions(+)
diff --git a/packaging/rules/rpm/jami-libclient.spec b/packaging/rules/rpm/jami-libclient.spec
index 5826c10e..d2c6d9c3 100644
--- a/packaging/rules/rpm/jami-libclient.spec
+++ b/packaging/rules/rpm/jami-libclient.spec
@@ -32,6 +32,23 @@ users.
%setup -n jami-project
%build
+# Configure and build bundled ffmpeg (for libavutil/avframe).
+mkdir -p %{_builddir}/jami-project/daemon/contrib/native
+cd %{_builddir}/jami-project/daemon/contrib/native && \
+ ../bootstrap \
+ --no-checksums \
+ --disable-ogg \
+ --disable-flac \
+ --disable-vorbis \
+ --disable-vorbisenc \
+ --disable-speex \
+ --disable-sndfile \
+ --disable-gsm \
+ --disable-speexdsp \
+ --disable-natpmp && \
+ make list && \
+ make fetch && \
+ make %{_smp_mflags} V=1 .ffmpeg
# Qt-related variables
cd %{_builddir}/jami-project/lrc && \
mkdir build && cd build && \
diff --git a/packaging/rules/rpm/jami-qt.spec b/packaging/rules/rpm/jami-qt.spec
index 4af924b3..a05755d7 100644
--- a/packaging/rules/rpm/jami-qt.spec
+++ b/packaging/rules/rpm/jami-qt.spec
@@ -38,6 +38,23 @@ privacy of its users.
%setup -n jami-project
%build
+# Configure and build bundled ffmpeg (for libavutil/avframe).
+mkdir -p %{_builddir}/jami-project/daemon/contrib/native
+cd %{_builddir}/jami-project/daemon/contrib/native && \
+ ../bootstrap \
+ --no-checksums \
+ --disable-ogg \
+ --disable-flac \
+ --disable-vorbis \
+ --disable-vorbisenc \
+ --disable-speex \
+ --disable-sndfile \
+ --disable-gsm \
+ --disable-speexdsp \
+ --disable-natpmp && \
+ make list && \
+ make fetch && \
+ make %{_smp_mflags} V=1 .ffmpeg
# Qt-related variables
cd %{_builddir}/jami-project/client-qt && \
mkdir build && cd build && \
--
GitLab