jyapayne/Sunshine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build: fix ubuntu 24.04 deps (#2374)

Browse source
This commit is contained in:
ReenigneArcher 2024-04-05 21:45:15 -04:00 • committed by GitHub
commit 1ed22ab3b2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.dockerignore
View file

@ -8,6 +8,7 @@
!/.rstcheck.cfg !/.rstcheck.cfg
# ignore repo directories and files # ignore repo directories and files
docker/
gh-pages-template/ gh-pages-template/
scripts/ scripts/
tools/ tools/
@ -15,6 +16,7 @@ crowdin.yml
# ignore dev directories # ignore dev directories
build/ build/
cmake-*/
venv/ venv/
# ignore artifacts # ignore artifacts

11
docker/ubuntu-24.04.dockerfile
View file

@ -38,10 +38,6 @@ apt-get install -y --no-install-recommends \
g++-11 \ g++-11 \
git \ git \
graphviz \ graphviz \
libavcodec60=7:6.1.1-1ubuntu1 \
libavfilter9=7:6.1.1-1ubuntu1 \
libavformat60=7:6.1.1-1ubuntu1 \
libavdevice-dev \
libayatana-appindicator3-dev \ libayatana-appindicator3-dev \
libboost-filesystem-dev=1.83.* \ libboost-filesystem-dev=1.83.* \
libboost-locale-dev=1.83.* \ libboost-locale-dev=1.83.* \
@ -67,7 +63,6 @@ apt-get install -y --no-install-recommends \
libxfixes-dev \ libxfixes-dev \
libxrandr-dev \ libxrandr-dev \
libxtst-dev \ libxtst-dev \
libzvbi-common=0.2.42-1.1 \
python3.11 \ python3.11 \
python3.11-venv \ python3.11-venv \
udev \ udev \
@ -82,12 +77,6 @@ apt-get clean
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
_DEPS _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 #Install Node
# hadolint ignore=SC1091 # hadolint ignore=SC1091