build: fix ubuntu 24.04 deps (LizardByte#2374)

KuleRucket · Jun 6, 2024 · 1f79613 · 1f79613
1 parent d44ba26
commit 1f79613
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -8,13 +8,15 @@
 !/.rstcheck.cfg
 
 # ignore repo directories and files
+docker/
 gh-pages-template/
 scripts/
 tools/
 crowdin.yml
 
 # ignore dev directories
 build/
+cmake-*/
 venv/
 
 # ignore artifacts

diff --git 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