From 7ab9b8995190b920c4cf4ec70a340857d0a4db85 Mon Sep 17 00:00:00 2001 From: Andriy Utkin Date: Wed, 18 Dec 2024 12:59:45 +0000 Subject: [PATCH] Use separate ffmpeg package See https://github.com/bluecherrydvr/bluecherry-ffmpeg See https://github.com/bluecherrydvr/bluecherry-apps/issues/721 --- debian/control.in | 2 ++ misc/BCMK | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/control.in b/debian/control.in index 7edb265f..d8524a42 100644 --- a/debian/control.in +++ b/debian/control.in @@ -13,6 +13,7 @@ Build-Depends: debhelper (>= 11), libidn11-dev, libbsd-dev, yasm, libudev-dev, libopencv-dev, libva-dev, libcurl4, libcurl4-dev, + bluecherry-ffmpeg, Standards-Version: 3.9.5 Package: bluecherry @@ -32,6 +33,7 @@ Depends: ${shlibs:Depends}, ssl-cert, ucf, curl, sysstat, rsyslog, logrotate, libcurl4, + bluecherry-ffmpeg, # python3-pip, #focal php-sqlite3, php-gd, php-curl, php-mysql #jammy php-sqlite3, php-gd, php-curl, php-mysql diff --git a/misc/BCMK b/misc/BCMK index 95530c42..2198b45e 100644 --- a/misc/BCMK +++ b/misc/BCMK @@ -35,7 +35,7 @@ libconfig-install: $(libconfig-contrib-dir)/libconfig.so ############### ### libav ### ############### -pkgs += libav +# pkgs += libav # not needed with bluecherry-ffmpeg package libav-gitrev = $(shell GIT_DIR=$(TOPDIR)/misc/libav/.git git describe) libav-contrib-dir = $(CONTRIB_DIR)/libav/$(libav-gitrev)