Skip to content

Commit d21548e

Browse files
authored
Fix GStreamer dependency collisions with OS
1 parent 3dac323 commit d21548e

File tree

5 files changed

+19
-15
lines changed

5 files changed

+19
-15
lines changed

.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,6 @@ RUN /tmp/install-desktop-environment.sh ${DESKTOP}
6868
# Install browser
6969
RUN cd /tmp && sudo apt-get update && \
7070
wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb && \
71-
sudo DEBIAN_FRONTEND=noninteractive apt install -y xdg-utils ./google-chrome-stable_current_amd64.deb && \
71+
sudo DEBIAN_FRONTEND=noninteractive apt-get install -y xdg-utils ./google-chrome-stable_current_amd64.deb && \
7272
sudo rm -f google-chrome-stable_current_amd64.deb && \
7373
xdg-settings set default-web-browser google-chrome.desktop

.devcontainer/features/desktop-selkies/src/install-desktop-environment.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ function install_xfce() {
1616
breeze-cursor-theme
1717

1818
# Configure desktop environment
19-
sudo apt remove -y \
19+
sudo apt-get remove -y \
2020
xfce4-screensaver
2121

2222
sudo ln -fs /etc/xfce4/defaults.list /usr/share/applications/defaults.list

Dockerfile.example

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install --no-instal
3434
wmctrl \
3535
jq \
3636
gdebi-core \
37-
glib-networking \
38-
libopus0 \
3937
libgdk-pixbuf2.0-0 \
4038
libgtk2.0-bin \
4139
libgl-dev \
@@ -49,18 +47,22 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install --no-instal
4947
xserver-xorg-core \
5048
wayland-protocols \
5149
libwayland-dev \
52-
libwayland-egl-backend-dev \
50+
libwayland-egl1 \
5351
libx11-xcb1 \
5452
libxkbcommon0 \
5553
libxdamage1 \
56-
libxml2-dev \
57-
libwebrtc-audio-processing1 \
54+
libsoup2.4-1 \
55+
libsoup-gnome2.4-1 \
5856
libsrtp2-1 \
59-
libcairo-gobject2 \
57+
lame \
58+
libopus0 \
59+
libwebrtc-audio-processing1 \
6060
pulseaudio \
6161
libpulse0 \
62+
libcairo-gobject2 \
6263
libpangocairo-1.0-0 \
63-
libgirepository1.0-dev \
64+
libgirepository1.0-1 \
65+
libopenjp2-7 \
6466
libjpeg-dev \
6567
libwebp-dev \
6668
libvpx-dev \

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ While this instruction assumes that you are installing this project systemwide,
5757
1. Install the dependencies, for Ubuntu or Debian-based distros run this command:
5858

5959
```bash
60-
sudo apt-get update && sudo apt-get install --no-install-recommends -y python3-pip python3-dev python3-gi python3-setuptools python3-wheel udev wmctrl jq gdebi-core glib-networking libopus0 libgdk-pixbuf2.0-0 libgtk2.0-bin libgl-dev libgles-dev libglvnd-dev libgudev-1.0-0 xclip x11-utils xdotool x11-xserver-utils xserver-xorg-core wayland-protocols libwayland-dev libwayland-egl-backend-dev libx11-xcb1 libxkbcommon0 libxdamage1 libxml2-dev libwebrtc-audio-processing1 libsrtp2-1 libcairo-gobject2 pulseaudio libpulse0 libpangocairo-1.0-0 libgirepository1.0-dev libjpeg-dev libwebp-dev libvpx-dev zlib1g-dev x264
60+
sudo apt-get update && sudo apt-get install --no-install-recommends -y python3-pip python3-dev python3-gi python3-setuptools python3-wheel udev wmctrl jq gdebi-core libgdk-pixbuf2.0-0 libgtk2.0-bin libgl-dev libgles-dev libglvnd-dev libgudev-1.0-0 xclip x11-utils xdotool x11-xserver-utils xserver-xorg-core wayland-protocols libwayland-dev libwayland-egl1 libx11-xcb1 libxkbcommon0 libxdamage1 libsoup2.4-1 libsoup-gnome2.4-1 libsrtp2-1 lame libopus0 libwebrtc-audio-processing1 pulseaudio libpulse0 libcairo-gobject2 libpangocairo-1.0-0 libgirepository1.0-1 libopenjp2-7 libjpeg-dev libwebp-dev libvpx-dev zlib1g-dev x264
6161
```
6262

6363
Additionally, install `xcvt` if using Ubuntu 22.04 (Mint 21) or an equivalent version of another operating system:
@@ -147,7 +147,7 @@ While this instruction assumes that you are installing this project systemwide,
147147
1. Install the dependencies, for Ubuntu or Debian-based distros run this command:
148148

149149
```bash
150-
sudo apt-get update && sudo apt-get install --no-install-recommends -y python3-pip python3-dev python3-gi python3-setuptools python3-wheel udev wmctrl jq gdebi-core glib-networking libopus0 libgdk-pixbuf2.0-0 libgtk2.0-bin libgl-dev libgles-dev libglvnd-dev libgudev-1.0-0 xclip x11-utils xdotool x11-xserver-utils xserver-xorg-core wayland-protocols libwayland-dev libwayland-egl-backend-dev libx11-xcb1 libxkbcommon0 libxdamage1 libxml2-dev libwebrtc-audio-processing1 libsrtp2-1 libcairo-gobject2 pulseaudio libpulse0 libpangocairo-1.0-0 libgirepository1.0-dev libjpeg-dev libwebp-dev libvpx-dev zlib1g-dev x264
150+
sudo apt-get update && sudo apt-get install --no-install-recommends -y python3-pip python3-dev python3-gi python3-setuptools python3-wheel udev wmctrl jq gdebi-core libgdk-pixbuf2.0-0 libgtk2.0-bin libgl-dev libgles-dev libglvnd-dev libgudev-1.0-0 xclip x11-utils xdotool x11-xserver-utils xserver-xorg-core wayland-protocols libwayland-dev libwayland-egl1 libx11-xcb1 libxkbcommon0 libxdamage1 libsoup2.4-1 libsoup-gnome2.4-1 libsrtp2-1 lame libopus0 libwebrtc-audio-processing1 pulseaudio libpulse0 libcairo-gobject2 libpangocairo-1.0-0 libgirepository1.0-1 libopenjp2-7 libjpeg-dev libwebp-dev libvpx-dev zlib1g-dev x264
151151
```
152152

153153
Additionally, install `xcvt` if using Ubuntu 22.04 (Mint 21) or an equivalent version of another operating system:

addons/gstreamer/Dockerfile

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,16 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
2020
autoconf \
2121
automake \
2222
autotools-dev \
23-
libtool \
2423
gettext \
2524
bison \
2625
flex \
2726
nasm \
28-
glib-networking \
2927
gtk-doc-tools \
3028
libgl-dev \
3129
libgles-dev \
3230
libglvnd-dev \
3331
libgudev-1.0-dev \
32+
libgirepository1.0-dev \
3433
libgtk2.0-dev \
3534
libtool-bin \
3635
libx11-xcb-dev \
@@ -39,13 +38,16 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
3938
libwayland-dev \
4039
libwayland-egl-backend-dev \
4140
libdrm-dev \
41+
libmp3lame-dev \
4242
libopus-dev \
4343
libpulse-dev \
44-
libgirepository1.0-dev \
4544
libwebrtc-audio-processing-dev \
46-
libssl-dev \
45+
libsoup2.4-dev \
46+
libsoup-gnome2.4-dev \
4747
libsrtp2-dev \
48+
libssl-dev \
4849
libjpeg-dev \
50+
libopenjp2-7-dev \
4951
libwebp-dev \
5052
libx264-dev \
5153
libvpx-dev \

0 commit comments

Comments
 (0)