From 1ed22ab3b2cec61701ab9825267ee5da82146a5e Mon Sep 17 00:00:00 2001
From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com>
Date: Fri, 5 Apr 2024 21:45:15 -0400
Subject: [PATCH] build: fix ubuntu 24.04 deps (#2374)

---
 .dockerignore                  |  2 ++
 docker/ubuntu-24.04.dockerfile | 11 -----------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index e7ccaee3..a6ccb41e 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -8,6 +8,7 @@
 !/.rstcheck.cfg
 
 # ignore repo directories and files
+docker/
 gh-pages-template/
 scripts/
 tools/
@@ -15,6 +16,7 @@ crowdin.yml
 
 # ignore dev directories
 build/
+cmake-*/
 venv/
 
 # ignore artifacts
diff --git a/docker/ubuntu-24.04.dockerfile b/docker/ubuntu-24.04.dockerfile
index e053fdc4..97008d95 100644
--- a/docker/ubuntu-24.04.dockerfile
+++ b/docker/ubuntu-24.04.dockerfile
@@ -38,10 +38,6 @@ apt-get install -y --no-install-recommends \
   g++-11 \
   git \
   graphviz \
-  libavcodec60=7:6.1.1-1ubuntu1 \
-  libavfilter9=7:6.1.1-1ubuntu1 \
-  libavformat60=7:6.1.1-1ubuntu1 \
-  libavdevice-dev \
   libayatana-appindicator3-dev \
   libboost-filesystem-dev=1.83.* \
   libboost-locale-dev=1.83.* \
@@ -67,7 +63,6 @@ apt-get install -y --no-install-recommends \
   libxfixes-dev \
   libxrandr-dev \
   libxtst-dev \
-  libzvbi-common=0.2.42-1.1 \
   python3.11 \
   python3.11-venv \
   udev \
@@ -82,12 +77,6 @@ apt-get clean
 rm -rf /var/lib/apt/lists/*
 _DEPS
 
-# TODO: remove the following... as of 2024-04-03, ubuntu cannot properly resolve the dependencies
-#  libavcodec60=7:6.1.1-1ubuntu1 \
-#  libavfilter9=7:6.1.1-1ubuntu1 \
-#  libavformat60=7:6.1.1-1ubuntu1 \
-#  libzvbi-common=0.2.42-1.1 \
-
 
 #Install Node
 # hadolint ignore=SC1091