From 3d2018302055a95fa17cbd4a318fbd7b85671ea8 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Thu, 4 Feb 2021 17:32:45 -0500 Subject: [PATCH] Remove mp4v2 --- distros/beowulf/control | 2 -- distros/redhat/zoneminder.spec | 4 ---- distros/ubuntu1504_cmake_split_packages/control | 4 ++-- distros/ubuntu2004/control | 2 -- 4 files changed, 2 insertions(+), 10 deletions(-) diff --git a/distros/beowulf/control b/distros/beowulf/control index 803d54dcc..28135f583 100644 --- a/distros/beowulf/control +++ b/distros/beowulf/control @@ -5,7 +5,6 @@ Maintainer: Isaac Connor Uploaders: Isaac Connor Build-Depends: debhelper, sphinx-doc, dh-linktree, dh-apache2 ,cmake - ,libx264-dev, libmp4v2-dev ,libavdevice-dev ,libavcodec-dev ,libavformat-dev @@ -43,7 +42,6 @@ Package: zoneminder Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends} ,javascript-common - ,libmp4v2-2, libx264-155 ,libswscale5 ,libswresample3 ,ffmpeg diff --git a/distros/redhat/zoneminder.spec b/distros/redhat/zoneminder.spec index 7e8287b40..494bed67d 100644 --- a/distros/redhat/zoneminder.spec +++ b/distros/redhat/zoneminder.spec @@ -88,10 +88,6 @@ BuildRequires: zlib-devel BuildRequires: ffmpeg BuildRequires: ffmpeg-devel -# Required for mp4 container support -BuildRequires: libmp4v2-devel -BuildRequires: x264-devel - # Allow existing user base to seamlessly transition to sub-packages Requires: %{name}-common%{?_isa} = %{version}-%{release} Requires: %{name}-httpd%{?_isa} = %{version}-%{release} diff --git a/distros/ubuntu1504_cmake_split_packages/control b/distros/ubuntu1504_cmake_split_packages/control index b24d67cf2..d4be60413 100644 --- a/distros/ubuntu1504_cmake_split_packages/control +++ b/distros/ubuntu1504_cmake_split_packages/control @@ -16,7 +16,7 @@ Build-Depends: debhelper (>= 9), po-debconf (>= 1.0), autoconf, automake, libtoo , libvlccore-dev, libvlc-dev , libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev , libgcrypt11-dev | libgcrypt20-dev, libpolkit-gobject-1-dev -, libdbi-perl, libnet-sftp-foreign-perl, libexpect-perl, libmime-tools-perl, libx264-dev, libmp4v2-dev +, libdbi-perl, libnet-sftp-foreign-perl, libexpect-perl, libmime-tools-perl Standards-Version: 3.9.6 Homepage: http://www.zoneminder.com/ @@ -75,7 +75,7 @@ Depends: libzoneminder-perl (= ${source:Version}), libdbi-perl, libmodule-load-conditional-perl, libmime-lite-perl, libmime-tools-perl, libnet-sftp-foreign-perl, libphp-serialization-perl, debconf, ffmpeg | libav-tools, rsyslog | system-log-daemon, zip, - policykit-1, apache2, libmp4v2-2, libpcre++0 + policykit-1, apache2, libpcre++0 , libsys-cpu-perl, libsys-meminfo-perl , libdata-dump-perl, libclass-std-fast-perl, libsoap-wsdl-perl, libio-socket-multicast-perl, libdigest-sha-perl Description: Core binaries and perl scripts for ZoneMinder diff --git a/distros/ubuntu2004/control b/distros/ubuntu2004/control index ca59cedbd..8ce42e9f0 100644 --- a/distros/ubuntu2004/control +++ b/distros/ubuntu2004/control @@ -5,7 +5,6 @@ Maintainer: Isaac Connor Uploaders: Isaac Connor Build-Depends: debhelper, dh-systemd, sphinx-doc, python3-sphinx, dh-linktree, dh-systemd, dh-apache2 ,cmake - ,libx264-dev, libmp4v2-dev ,libavdevice-dev ,libavcodec-dev ,libavformat-dev @@ -45,7 +44,6 @@ Package: zoneminder Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends} ,javascript-common - ,libmp4v2-2, libx264-155 ,libswscale5 ,libswresample3 ,ffmpeg