From 19034ec624827f1d744c57355f02053ea5707ed0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Tue, 12 Nov 2019 11:16:41 -0500
Subject: [PATCH] packaging: bundle ffmpeg to deb packages and fedora packages
Change-Id: I5ac52f9e47a02cbfa23b4d90563af0133e15977a
---
packaging/rules/debian/rules | 3 ++-
packaging/rules/fedora/jami.spec | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/packaging/rules/debian/rules b/packaging/rules/debian/rules
index f1fbab0f..8d932bd6 100755
--- a/packaging/rules/debian/rules
+++ b/packaging/rules/debian/rules
@@ -52,7 +52,8 @@ override_dh_auto_configure:
--disable-natpmp \
--enable-gnutls && \
make list && \
- make -j$(NO_CPUS) V=1
+ make -j$(NO_CPUS) V=1 && \
+ make -j$(NO_CPUS) .ffmpeg V=1
cd daemon && \
./autogen.sh && \
./configure \
diff --git a/packaging/rules/fedora/jami.spec b/packaging/rules/fedora/jami.spec
index 138dd2e5..0de9130c 100644
--- a/packaging/rules/fedora/jami.spec
+++ b/packaging/rules/fedora/jami.spec
@@ -105,7 +105,8 @@ cd %{_builddir}/ring-project/daemon/contrib/native && \
--disable-natpmp && \
make list && \
make fetch && \
- make -j4 V=1
+ make -j4 V=1 && \
+ make -j4 V=1 .ffmpeg
cd %{_builddir}/ring-project/daemon && \
./autogen.sh && \
--
GitLab