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