Build: Remove dependency on libavdevice

We currently don't use the library so don't depend on it.

.github/workflows/ci-bullseye.yml

@@ -38,7 +38,15 @@ jobs:
         with:
           submodules: recursive
       - name: Install dependencies
-        run: apt-get -qq install make cmake g++ default-libmysqlclient-dev libavdevice-dev libcurl4-gnutls-dev libvlc-dev libvncserver-dev libdate-manip-perl libdbd-mysql-perl libsys-mmap-perl libwww-perl libpolkit-gobject-1-dev catch2 ${{ matrix.crypto_package }} ${{ matrix.jwt_package }}
+        run: >
+          apt-get -qq install make cmake g++
+          default-libmysqlclient-dev
+          libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libswscale-dev
+          libcurl4-gnutls-dev libvlc-dev libvncserver-dev
+          libdate-manip-perl libdbd-mysql-perl libsys-mmap-perl libwww-perl
+          libpolkit-gobject-1-dev
+          catch2
+          ${{ matrix.crypto_package }} ${{ matrix.jwt_package }}
       - name: Prepare
         run: mkdir build
       - name: Configure

.github/workflows/ci-buster.yml

@@ -38,7 +38,14 @@ jobs:
         with:
           submodules: recursive
       - name: Install dependencies
-        run: apt-get -qq install make cmake g++ default-libmysqlclient-dev libavdevice-dev libcurl4-gnutls-dev libvlc-dev libvncserver-dev libdate-manip-perl libdbd-mysql-perl libsys-mmap-perl libwww-perl libpolkit-gobject-1-dev ${{ matrix.crypto_package }} ${{ matrix.jwt_package }}
+        run: >
+          apt-get -qq install make cmake g++
+          default-libmysqlclient-dev
+          libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libswscale-dev
+          libcurl4-gnutls-dev libvlc-dev libvncserver-dev
+          libdate-manip-perl libdbd-mysql-perl libsys-mmap-perl libwww-perl
+          libpolkit-gobject-1-dev
+          ${{ matrix.crypto_package }} ${{ matrix.jwt_package }}
       - name: Prepare
         run: mkdir build
       - name: Configure

.github/workflows/ci-stretch.yml

@@ -24,7 +24,14 @@ jobs:
         with:
           submodules: recursive
       - name: Install dependencies
-        run: apt-get -qq install make cmake g++ default-libmysqlclient-dev libavdevice-dev libcurl4-gnutls-dev libvlc-dev libvncserver-dev libdate-manip-perl libdbd-mysql-perl libsys-mmap-perl libwww-perl libpolkit-gobject-1-dev libssl-dev
+        run: >
+          apt-get -qq install make cmake g++
+          default-libmysqlclient-dev
+          libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libswscale-dev
+          libcurl4-gnutls-dev libvlc-dev libvncserver-dev
+          libdate-manip-perl libdbd-mysql-perl libsys-mmap-perl libwww-perl
+          libpolkit-gobject-1-dev
+          libssl-dev
       - name: Prepare
         run: mkdir build
       - name: Configure

.github/workflows/ci-xenial.yml

@@ -18,7 +18,11 @@ jobs:
         with:
           submodules: recursive
       - name: Install dependencies
-        run: sudo apt-get -qq install libavdevice-dev libcurl4-gnutls-dev libvlc-dev libvncserver-dev libdate-manip-perl libdbd-mysql-perl libsys-mmap-perl libpolkit-gobject-1-dev
+        run: >
+          sudo apt-get -qq install libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libswscale-dev
+          libcurl4-gnutls-dev libvlc-dev libvncserver-dev
+          libdate-manip-perl libdbd-mysql-perl libsys-mmap-perl
+          libpolkit-gobject-1-dev
       - name: Prepare
         run: mkdir build
       - name: Configure

.github/workflows/codeql-analysis.yml

@@ -52,7 +52,7 @@ jobs:
         git submodule init
         git submodule update --init --recursive
         sudo apt-get update
-        sudo apt-get install libavdevice-dev libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libswscale-dev  libjwt-gnutls-dev
+        sudo apt-get install libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libswscale-dev libjwt-gnutls-dev
         sudo apt-get install libbz2-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 libdate-manip-perl libdbd-mysql-perl libphp-serialization-perl libsys-mmap-perl

CMakeLists.txt

@@ -449,16 +449,6 @@ find_package(FFMPEG REQUIRED
 set(CMAKE_REQUIRED_INCLUDES ${FFMPEG_avutil_INCLUDE_DIRS})
 check_include_file("libavutil/hwcontext.h" HAVE_LIBAVUTIL_HWCONTEXT_H)
 
-find_package(FFMPEG COMPONENTS avdevice)
-if(FFMPEG_avdevice_FOUND)
-  set(HAVE_LIBAVDEVICE 1)
-  set(HAVE_LIBAVDEVICE_AVDEVICE_H 1)
-  list(APPEND ZM_BIN_LIBS "${FFMPEG_avdevice_LIBRARIES}")
-  set(optlibsfound "${optlibsfound} AVDevice")
-else()
-  set(optlibsnotfound "${optlibsnotfound} AVDevice")
-endif()
-
 set(PATH_FFMPEG "")
 set(OPT_FFMPEG "no")
 

distros/beowulf/control

@@ -5,7 +5,6 @@ Maintainer: Isaac Connor <isaac@zoneminder.com>
 Uploaders: Isaac Connor <isaac@zoneminder.com>
 Build-Depends: debhelper, sphinx-doc, dh-linktree, dh-apache2
               ,cmake
-              ,libavdevice-dev
               ,libavcodec-dev
               ,libavformat-dev
               ,libavutil-dev

distros/debian/control

@@ -9,7 +9,6 @@ Build-Depends: debhelper (>= 9), cmake
     , libjpeg8-dev | libjpeg-dev
     , libpcre3-dev
     , libavcodec-dev, libavformat-dev (>= 3:0.svn20090204), libswscale-dev (>= 3:0.svn20090204), libavutil-dev
-    , libavdevice-dev
     , libv4l-dev (>= 0.8.3)
     , libbz2-dev
     , ffmpeg | libav-tools
@@ -47,7 +46,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
     ,libnumber-bytes-human-perl
     ,libfile-slurp-perl
     , libpcre3
-    , ffmpeg | libav-tools, libavdevice53 | libavdevice55 | libavdevice57
+    , ffmpeg | libav-tools
     , rsyslog | system-log-daemon
     , netpbm
     , zip

distros/ubuntu1504_cmake_split_packages/control

@@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 9), po-debconf (>= 1.0), autoconf, automake, libtoo
 , libdate-manip-perl, libwww-perl
 , libjpeg8-dev | libjpeg9-dev | libjpeg62-turbo-dev
 , libpcre3-dev
-, libavcodec-ffmpeg-dev, libavformat-ffmpeg-dev, libswscale-ffmpeg-dev, libavutil-ffmpeg-dev, libavdevice-ffmpeg-dev
+, libavcodec-ffmpeg-dev, libavformat-ffmpeg-dev, libswscale-ffmpeg-dev, libavutil-ffmpeg-dev
 , libv4l-dev (>= 0.8.3)
 , libbz2-dev
 , libsys-mmap-perl

distros/ubuntu1604/control

@@ -5,7 +5,6 @@ Maintainer: Isaac Connor <isaac@zoneminder.com>
 Uploaders: Isaac Connor <isaac@zoneminder.com>
 Build-Depends: debhelper (>= 9), dh-systemd, python3-sphinx, apache2-dev, dh-linktree, dh-systemd, dh-apache2
               ,cmake
-              ,libavdevice-dev (>= 6:10~)
               ,libavcodec-dev (>= 6:10~)
               ,libavformat-dev  (>= 6:10~)
               ,libavutil-dev (>= 6:10~)

distros/ubuntu2004/control

@@ -4,7 +4,6 @@ Priority: optional
 Maintainer: Isaac Connor <isaac@zoneminder.com>
 Build-Depends: debhelper (>= 12), sphinx-doc, python3-sphinx, dh-linktree, dh-apache2
               ,cmake
-              ,libavdevice-dev
               ,libavcodec-dev
               ,libavformat-dev
               ,libavutil-dev

src/zm_ffmpeg.h

@@ -137,20 +137,6 @@ extern "C" {
     ( (LIBAVFORMAT_VERSION_MICRO <  100 && LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(a, b, c) ) || \
       (LIBAVFORMAT_VERSION_MICRO >= 100 && LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(a, d, e) ) )
 
-// AVDEVICE
-#if HAVE_LIBAVDEVICE_AVDEVICE_H
-#include <libavdevice/avdevice.h>
-
-/* LIBAVDEVICE_VERSION_CHECK checks for the right version of libav and FFmpeg
- * a is the major version
- * b and c the minor and micro versions of libav
- * d and e the minor and micro versions of FFmpeg */
-#define LIBAVDEVICE_VERSION_CHECK(a, b, c, d, e) \
-    ( (LIBAVDEVICE_VERSION_MICRO <  100 && LIBAVDEVICE_VERSION_INT >= AV_VERSION_INT(a, b, c) ) || \
-      (LIBAVDEVICE_VERSION_MICRO >= 100 && LIBAVDEVICE_VERSION_INT >= AV_VERSION_INT(a, d, e) ) )
-
-#endif /* HAVE_LIBAVDEVICE_AVDEVICE_H */
-
 // SWSCALE
 #include <libswscale/swscale.h>
 

zoneminder-config.cmake

@@ -34,8 +34,6 @@
 #cmakedefine HAVE_LIBGNUTLS 1
 #cmakedefine HAVE_LIBMYSQLCLIENT 1
 #cmakedefine HAVE_MYSQL_H 1
-#cmakedefine HAVE_LIBAVDEVICE 1
-#cmakedefine HAVE_LIBAVDEVICE_AVDEVICE_H 1
 #cmakedefine HAVE_LIBAVUTIL_HWCONTEXT_H 1
 #cmakedefine HAVE_LIBVLC 1
 #cmakedefine HAVE_VLC_VLC_H 1