Skip to content

Commit 1ed22ab

Browse files
build: fix ubuntu 24.04 deps (#2374)
1 parent 42b4192 commit 1ed22ab

2 files changed

Lines changed: 2 additions & 11 deletions

File tree

.dockerignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,15 @@
88
!/.rstcheck.cfg
99

1010
# ignore repo directories and files
11+
docker/
1112
gh-pages-template/
1213
scripts/
1314
tools/
1415
crowdin.yml
1516

1617
# ignore dev directories
1718
build/
19+
cmake-*/
1820
venv/
1921

2022
# ignore artifacts

docker/ubuntu-24.04.dockerfile

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,6 @@ apt-get install -y --no-install-recommends \
3838
g++-11 \
3939
git \
4040
graphviz \
41-
libavcodec60=7:6.1.1-1ubuntu1 \
42-
libavfilter9=7:6.1.1-1ubuntu1 \
43-
libavformat60=7:6.1.1-1ubuntu1 \
44-
libavdevice-dev \
4541
libayatana-appindicator3-dev \
4642
libboost-filesystem-dev=1.83.* \
4743
libboost-locale-dev=1.83.* \
@@ -67,7 +63,6 @@ apt-get install -y --no-install-recommends \
6763
libxfixes-dev \
6864
libxrandr-dev \
6965
libxtst-dev \
70-
libzvbi-common=0.2.42-1.1 \
7166
python3.11 \
7267
python3.11-venv \
7368
udev \
@@ -82,12 +77,6 @@ apt-get clean
8277
rm -rf /var/lib/apt/lists/*
8378
_DEPS
8479

85-
# TODO: remove the following... as of 2024-04-03, ubuntu cannot properly resolve the dependencies
86-
# libavcodec60=7:6.1.1-1ubuntu1 \
87-
# libavfilter9=7:6.1.1-1ubuntu1 \
88-
# libavformat60=7:6.1.1-1ubuntu1 \
89-
# libzvbi-common=0.2.42-1.1 \
90-
9180

9281
#Install Node
9382
# hadolint ignore=SC1091

0 commit comments

Comments
 (0)