Skip to content

Commit ee3b1b2

Browse files
committed
bump selkies use new audio stack
1 parent 1898697 commit ee3b1b2

3 files changed

Lines changed: 18 additions & 22 deletions

File tree

Dockerfile

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ RUN \
1515
https://github.com/selkies-project/selkies.git \
1616
/src && \
1717
cd /src && \
18-
git checkout -f fe21491c3ee7467cb37c2367d294e353ca0b7b7a
18+
git checkout -f 9df2a1b6334b0fc2c98b641d41557741b89e5c1f
1919

2020
RUN \
2121
echo "**** build frontend ****" && \
@@ -60,6 +60,8 @@ RUN \
6060
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
6161
libev-dev \
6262
libjpeg62-turbo-dev \
63+
libopus-dev \
64+
libpulse-dev \
6365
libx11-dev \
6466
libxext-dev \
6567
libxfixes-dev \
@@ -94,12 +96,7 @@ RUN \
9496
fonts-noto-core \
9597
g++ \
9698
gcc \
97-
gir1.2-gst-plugins-bad-1.0 \
98-
gir1.2-gstreamer-1.0 \
9999
git \
100-
gstreamer1.0-nice \
101-
gstreamer1.0-plugins-* \
102-
gstreamer1.0-pulseaudio \
103100
intel-media-va-driver \
104101
kbd \
105102
libev4 \
@@ -115,6 +112,7 @@ RUN \
115112
libjpeg62-turbo \
116113
libnginx-mod-http-fancyindex \
117114
libnotify-bin \
115+
libopus0 \
118116
libp11-kit0 \
119117
libpam0g \
120118
libtasn1-6 \
@@ -145,8 +143,6 @@ RUN \
145143
pulseaudio \
146144
pulseaudio-utils \
147145
python3 \
148-
python3-gi \
149-
python3-gst-1.0 \
150146
software-properties-common \
151147
ssl-cert \
152148
stterm \
@@ -181,12 +177,12 @@ RUN \
181177
apt install -t bookworm-backports -y \
182178
mesa-libgallium && \
183179
echo "**** install selkies ****" && \
184-
pip3 install pixelflux --break-system-packages && \
180+
pip3 install pixelflux pcmflux --break-system-packages && \
185181
SELKIES_RELEASE=$(curl -sX GET "https://api.github.com/repos/selkies-project/selkies/releases/latest" \
186182
| awk '/tag_name/{print $4;exit}' FS='[""]') && \
187183
curl -o \
188184
/tmp/selkies.tar.gz -L \
189-
"https://github.com/selkies-project/selkies/archive/fe21491c3ee7467cb37c2367d294e353ca0b7b7a.tar.gz" && \
185+
"https://github.com/selkies-project/selkies/archive/9df2a1b6334b0fc2c98b641d41557741b89e5c1f.tar.gz" && \
190186
cd /tmp && \
191187
tar xf selkies.tar.gz && \
192188
cd selkies-* && \
@@ -256,6 +252,8 @@ RUN \
256252
echo "**** cleanup ****" && \
257253
apt-get purge -y --autoremove \
258254
libjpeg62-turbo-dev \
255+
libopus-dev \
256+
libpulse-dev \
259257
libx11-dev \
260258
libxext-dev \
261259
libx264-dev \

Dockerfile.aarch64

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ RUN \
1515
https://github.com/selkies-project/selkies.git \
1616
/src && \
1717
cd /src && \
18-
git checkout -f fe21491c3ee7467cb37c2367d294e353ca0b7b7a
18+
git checkout -f 9df2a1b6334b0fc2c98b641d41557741b89e5c1f
1919

2020
RUN \
2121
echo "**** build frontend ****" && \
@@ -60,6 +60,8 @@ RUN \
6060
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
6161
libev-dev \
6262
libjpeg62-turbo-dev \
63+
libopus-dev \
64+
libpulse-dev \
6365
libx11-dev \
6466
libxext-dev \
6567
libxfixes-dev \
@@ -94,12 +96,7 @@ RUN \
9496
fonts-noto-core \
9597
g++ \
9698
gcc \
97-
gir1.2-gst-plugins-bad-1.0 \
98-
gir1.2-gstreamer-1.0 \
9999
git \
100-
gstreamer1.0-nice \
101-
gstreamer1.0-plugins-* \
102-
gstreamer1.0-pulseaudio \
103100
kbd \
104101
libev4 \
105102
libfontenc1 \
@@ -114,6 +111,7 @@ RUN \
114111
libjpeg62-turbo \
115112
libnginx-mod-http-fancyindex \
116113
libnotify-bin \
114+
libopus0 \
117115
libp11-kit0 \
118116
libpam0g \
119117
libtasn1-6 \
@@ -144,8 +142,6 @@ RUN \
144142
pulseaudio \
145143
pulseaudio-utils \
146144
python3 \
147-
python3-gi \
148-
python3-gst-1.0 \
149145
software-properties-common \
150146
ssl-cert \
151147
stterm \
@@ -179,12 +175,12 @@ RUN \
179175
apt install -t bookworm-backports -y \
180176
mesa-libgallium && \
181177
echo "**** install selkies ****" && \
182-
pip3 install pixelflux --break-system-packages && \
178+
pip3 install pixelflux pcmflux --break-system-packages && \
183179
SELKIES_RELEASE=$(curl -sX GET "https://api.github.com/repos/selkies-project/selkies/releases/latest" \
184180
| awk '/tag_name/{print $4;exit}' FS='[""]') && \
185181
curl -o \
186182
/tmp/selkies.tar.gz -L \
187-
"https://github.com/selkies-project/selkies/archive/fe21491c3ee7467cb37c2367d294e353ca0b7b7a.tar.gz" && \
183+
"https://github.com/selkies-project/selkies/archive/9df2a1b6334b0fc2c98b641d41557741b89e5c1f.tar.gz" && \
188184
cd /tmp && \
189185
tar xf selkies.tar.gz && \
190186
cd selkies-* && \
@@ -254,6 +250,8 @@ RUN \
254250
echo "**** cleanup ****" && \
255251
apt-get purge -y --autoremove \
256252
libjpeg62-turbo-dev \
253+
libopus-dev \
254+
libpulse-dev \
257255
libx11-dev \
258256
libxext-dev \
259257
libx264-dev \

root/etc/s6-overlay/s6-rc.d/svc-selkies/run

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ if [ ! -z ${DEV_MODE+x} ]; then
6464
fi
6565

6666

67-
# Start the Selkies-GStreamer WebRTC HTML5 remote desktop application
67+
# Start Selkies
6868
exec s6-setuidgid abc \
69-
selkies-gstreamer \
69+
selkies \
7070
--addr="localhost" \
7171
--port="8081" \
7272
--enable_basic_auth="false" \

0 commit comments

Comments
 (0)