ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: Add fmt as a required dependency

This commit is contained in:
Peter Keresztes Schmidt 2021-02-02 21:08:05 +01:00
parent 33dbcc449a
commit 1a6b26f2ab
5 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cirrus.yml
View File

@ -4,7 +4,7 @@ task:
image_family: freebsd-12-2 image_family: freebsd-12-2
prepare_script: prepare_script:
- pkg install -yq git cmake jpeg-turbo mysql80-client ffmpeg libvncserver libjwt catch p5-DBI p5-DBD-mysql p5-Date-Manip p5-Test-LWP-UserAgent p5-Sys-Mmap - pkg install -yq git cmake jpeg-turbo mysql80-client ffmpeg libvncserver libjwt libfmt catch p5-DBI p5-DBD-mysql p5-Date-Manip p5-Test-LWP-UserAgent p5-Sys-Mmap
configure_script: configure_script:
- git submodule update --init --recursive - git submodule update --init --recursive

2
.github/workflows/codeql-analysis.yml vendored
View File

@ -54,7 +54,7 @@ jobs:
sudo apt-get update sudo apt-get update
sudo apt-get install libx264-dev libmp4v2-dev libavdevice-dev libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libswscale-dev sudo apt-get install libx264-dev libmp4v2-dev libavdevice-dev libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libswscale-dev
sudo apt-get install libbz2-dev libgcrypt20-dev libcurl4-gnutls-dev libjpeg-turbo8-dev libturbojpeg0-dev sudo apt-get install libbz2-dev libgcrypt20-dev libcurl4-gnutls-dev libjpeg-turbo8-dev libturbojpeg0-dev
sudo apt-get install default-libmysqlclient-dev libpcre3-dev libpolkit-gobject-1-dev libv4l-dev libvlc-dev sudo apt-get install default-libmysqlclient-dev libpcre3-dev libpolkit-gobject-1-dev libv4l-dev libvlc-dev libfmt-dev
sudo apt-get install libdate-manip-perl libdbd-mysql-perl libphp-serialization-perl libsys-mmap-perl sudo apt-get install libdate-manip-perl libdbd-mysql-perl libphp-serialization-perl libsys-mmap-perl
sudo apt-get install libwww-perl libdata-uuid-perl libssl-dev libcrypt-eksblowfish-perl libdata-entropy-perl sudo apt-get install libwww-perl libdata-uuid-perl libssl-dev libcrypt-eksblowfish-perl libdata-entropy-perl

2
CMakeLists.txt
View File

@ -644,6 +644,8 @@ else()
set(HAVE_RTSP_SERVER 0) set(HAVE_RTSP_SERVER 0)
endif() endif()
find_package(fmt REQUIRED)
# #
# *** END OF LIBRARY CHECKS *** # *** END OF LIBRARY CHECKS ***

2
distros/redhat/zoneminder.spec
View File

@ -83,6 +83,7 @@ BuildRequires: libv4l-devel
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: gzip BuildRequires: gzip
BuildRequires: zlib-devel BuildRequires: zlib-devel
BuildRequires: fmt-devel
# ZoneMinder looks for and records the location of the ffmpeg binary during build # ZoneMinder looks for and records the location of the ffmpeg binary during build
BuildRequires: ffmpeg BuildRequires: ffmpeg
@ -131,6 +132,7 @@ Requires: perl(Net::FTP)
Requires: perl(LWP::Protocol::https) Requires: perl(LWP::Protocol::https)
Requires: ca-certificates Requires: ca-certificates
Requires: zip Requires: zip
Requires: fmt
%{?systemd_requires} %{?systemd_requires}
Requires(post): %{_bindir}/gpasswd Requires(post): %{_bindir}/gpasswd

2
distros/ubuntu2004/control
View File

@ -32,6 +32,7 @@ Build-Depends: debhelper (>= 12), sphinx-doc, python3-sphinx, dh-linktree, dh-ap
,libcrypt-eksblowfish-perl ,libcrypt-eksblowfish-perl
,libdata-entropy-perl ,libdata-entropy-perl
,libvncserver-dev ,libvncserver-dev
,libfmt-dev
Standards-Version: 4.5.0 Standards-Version: 4.5.0
Homepage: https://www.zoneminder.com/ Homepage: https://www.zoneminder.com/
@ -74,6 +75,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
,libcrypt-eksblowfish-perl ,libcrypt-eksblowfish-perl
,libdata-entropy-perl ,libdata-entropy-perl
,libvncclient1|libvncclient0 ,libvncclient1|libvncclient0
,libfmt
Recommends: ${misc:Recommends} Recommends: ${misc:Recommends}
,libapache2-mod-php | php-fpm ,libapache2-mod-php | php-fpm
,default-mysql-server | mariadb-server | virtual-mysql-server ,default-mysql-server | mariadb-server | virtual-mysql-server