From b9865de779aedaada6f401ac734e93c27a090670 Mon Sep 17 00:00:00 2001 From: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com> Date: Tue, 26 Jul 2016 14:05:54 -0400 Subject: [PATCH] packaging: remove libsrtp dependency libsrtp is used by pjproject, but it is built as part of pjproject Reviewed-by: Alexandre Viau <alexandre.viau@savoirfairelinux.com> Change-Id: I809b028cc07e4f8d43273087f1a263e5ae02e72b --- docker/Dockerfile_debian_8 | 1 - docker/Dockerfile_debian_8_i386 | 1 - docker/Dockerfile_debian_9 | 1 - docker/Dockerfile_debian_9_i386 | 1 - docker/Dockerfile_ubuntu_14.04 | 1 - docker/Dockerfile_ubuntu_14.04_i386 | 1 - docker/Dockerfile_ubuntu_15.10 | 1 - docker/Dockerfile_ubuntu_15.10_i386 | 1 - docker/Dockerfile_ubuntu_16.04 | 1 - docker/Dockerfile_ubuntu_16.04_i386 | 1 - packaging/rules/debian/control | 1 - 11 files changed, 11 deletions(-) diff --git a/docker/Dockerfile_debian_8 b/docker/Dockerfile_debian_8 index b2d89056..be9a3d7d 100644 --- a/docker/Dockerfile_debian_8 +++ b/docker/Dockerfile_debian_8 @@ -38,7 +38,6 @@ RUN apt-get update && \ libyaml-cpp-dev \ libboost-dev \ libsndfile1-dev \ - libsrtp-dev \ libxext-dev \ libxfixes-dev \ libspeex-dev \ diff --git a/docker/Dockerfile_debian_8_i386 b/docker/Dockerfile_debian_8_i386 index 57316cdc..a2bc452d 100644 --- a/docker/Dockerfile_debian_8_i386 +++ b/docker/Dockerfile_debian_8_i386 @@ -38,7 +38,6 @@ RUN apt-get update && \ libyaml-cpp-dev \ libboost-dev \ libsndfile1-dev \ - libsrtp-dev \ libxext-dev \ libxfixes-dev \ libspeex-dev \ diff --git a/docker/Dockerfile_debian_9 b/docker/Dockerfile_debian_9 index 5156fcb3..16fae846 100644 --- a/docker/Dockerfile_debian_9 +++ b/docker/Dockerfile_debian_9 @@ -38,7 +38,6 @@ RUN apt-get update && \ libyaml-cpp-dev \ libboost-dev \ libsndfile1-dev \ - libsrtp-dev \ libxext-dev \ libxfixes-dev \ libspeex-dev \ diff --git a/docker/Dockerfile_debian_9_i386 b/docker/Dockerfile_debian_9_i386 index b38f9ded..973d6de3 100644 --- a/docker/Dockerfile_debian_9_i386 +++ b/docker/Dockerfile_debian_9_i386 @@ -38,7 +38,6 @@ RUN apt-get update && \ libyaml-cpp-dev \ libboost-dev \ libsndfile1-dev \ - libsrtp-dev \ libxext-dev \ libxfixes-dev \ libspeex-dev \ diff --git a/docker/Dockerfile_ubuntu_14.04 b/docker/Dockerfile_ubuntu_14.04 index 37cc8328..5233db51 100644 --- a/docker/Dockerfile_ubuntu_14.04 +++ b/docker/Dockerfile_ubuntu_14.04 @@ -39,7 +39,6 @@ RUN apt-get update && \ libyaml-cpp-dev \ libboost-dev \ libsndfile1-dev \ - libsrtp-dev \ libxext-dev \ libxfixes-dev \ libspeex-dev \ diff --git a/docker/Dockerfile_ubuntu_14.04_i386 b/docker/Dockerfile_ubuntu_14.04_i386 index 659150dc..a5ae1d0d 100644 --- a/docker/Dockerfile_ubuntu_14.04_i386 +++ b/docker/Dockerfile_ubuntu_14.04_i386 @@ -39,7 +39,6 @@ RUN apt-get update && \ libyaml-cpp-dev \ libboost-dev \ libsndfile1-dev \ - libsrtp-dev \ libxext-dev \ libxfixes-dev \ libspeex-dev \ diff --git a/docker/Dockerfile_ubuntu_15.10 b/docker/Dockerfile_ubuntu_15.10 index b5afa240..01e758b4 100644 --- a/docker/Dockerfile_ubuntu_15.10 +++ b/docker/Dockerfile_ubuntu_15.10 @@ -39,7 +39,6 @@ RUN apt-get update && \ libyaml-cpp-dev \ libboost-dev \ libsndfile1-dev \ - libsrtp-dev \ libxext-dev \ libxfixes-dev \ libspeex-dev \ diff --git a/docker/Dockerfile_ubuntu_15.10_i386 b/docker/Dockerfile_ubuntu_15.10_i386 index c87c858c..6bc13111 100644 --- a/docker/Dockerfile_ubuntu_15.10_i386 +++ b/docker/Dockerfile_ubuntu_15.10_i386 @@ -39,7 +39,6 @@ RUN apt-get update && \ libyaml-cpp-dev \ libboost-dev \ libsndfile1-dev \ - libsrtp-dev \ libxext-dev \ libxfixes-dev \ libspeex-dev \ diff --git a/docker/Dockerfile_ubuntu_16.04 b/docker/Dockerfile_ubuntu_16.04 index 911ac87e..204077f2 100644 --- a/docker/Dockerfile_ubuntu_16.04 +++ b/docker/Dockerfile_ubuntu_16.04 @@ -39,7 +39,6 @@ RUN apt-get update && \ libyaml-cpp-dev \ libboost-dev \ libsndfile1-dev \ - libsrtp-dev \ libxext-dev \ libxfixes-dev \ libspeex-dev \ diff --git a/docker/Dockerfile_ubuntu_16.04_i386 b/docker/Dockerfile_ubuntu_16.04_i386 index ce153a7a..d298493a 100644 --- a/docker/Dockerfile_ubuntu_16.04_i386 +++ b/docker/Dockerfile_ubuntu_16.04_i386 @@ -39,7 +39,6 @@ RUN apt-get update && \ libyaml-cpp-dev \ libboost-dev \ libsndfile1-dev \ - libsrtp-dev \ libxext-dev \ libxfixes-dev \ libspeex-dev \ diff --git a/packaging/rules/debian/control b/packaging/rules/debian/control index ec82970c..14e48d02 100644 --- a/packaging/rules/debian/control +++ b/packaging/rules/debian/control @@ -50,7 +50,6 @@ Build-Depends: debhelper (>= 9), libjsoncpp-dev, libnatpmp-dev, # other - libsrtp-dev, yasm, libsamplerate0-dev Standards-Version: 3.9.8 -- GitLab