Skip to content

Commit 7b1edb2

Browse files
authored
Merge pull request #8013 from colonelpanic8/codex/wireplumber-0.5
Install WirePlumber 0.5 in build image
2 parents a5f2fd3 + 06d65b8 commit 7b1edb2

3 files changed

Lines changed: 25 additions & 3 deletions

File tree

build-constraints.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4712,13 +4712,13 @@ packages:
47124712
- gi-cairo-connector
47134713
- gi-cairo-render
47144714
- gi-gtk-layer-shell
4715-
- gi-wireplumber < 0 # needs wireplumber-0.5 (Ubuntu 24.04 has 0.4)
4715+
- gi-wireplumber
47164716
- gtk-scaling-image
47174717
- gtk-sni-tray
47184718
- gtk-strut
47194719
- rate-limit
47204720
- status-notifier-item
4721-
- taffybar < 7.2
4721+
- taffybar
47224722
- time-units
47234723
- xml-helpers
47244724
- xdg-desktop-entry

docker/02-apt-get-install.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ apt-get install -y \
3232
gir1.2-soup-3.0 \
3333
git \
3434
gnupg \
35+
gobject-introspection \
3536
gradle \
3637
hscolour \
3738
libadns1-dev \
@@ -86,6 +87,7 @@ apt-get install -y \
8687
liblmdb-dev \
8788
liblz4-tool \
8889
liblzma-dev \
90+
liblua5.4-dev \
8991
libmagic-dev \
9092
libmagickcore-dev \
9193
libmagickwand-dev \
@@ -107,6 +109,7 @@ apt-get install -y \
107109
libpcap0.8-dev \
108110
libpcre2-dev \
109111
libpcre3-dev \
112+
libpipewire-0.3-dev \
110113
libpq-dev \
111114
libprimecount-dev \
112115
libprotobuf-dev \
@@ -135,7 +138,6 @@ apt-get install -y \
135138
libusb-1.0-0-dev \
136139
libvte-2.91-dev \
137140
libwebkit2gtk-4.1-dev \
138-
libwireplumber-0.4-dev \
139141
libxau-dev \
140142
libxml2-dev \
141143
libxrandr-dev \
@@ -149,6 +151,7 @@ apt-get install -y \
149151
llvm-15 \
150152
locales \
151153
m4 \
154+
meson \
152155
minisat \
153156
mono-mcs \
154157
nettle-dev \
@@ -157,6 +160,7 @@ apt-get install -y \
157160
nodejs \
158161
nvidia-cuda-toolkit \
159162
openjdk-8-jdk \
163+
pkg-config \
160164
python3-matplotlib \
161165
python3-numpy \
162166
python3-pip \

docker/03-custom-install.sh

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,24 @@ locale-gen en_US.UTF-8
1414
update-alternatives --install "/usr/bin/ld" "ld" "/usr/bin/ld.gold" 20
1515
update-alternatives --install "/usr/bin/ld" "ld" "/usr/bin/ld.bfd" 10
1616

17+
# Install WirePlumber 0.5 for gi-wireplumber and taffybar.
18+
# Ubuntu 24.04 only packages WirePlumber 0.4.
19+
WIREPLUMBER_VER=0.5.14
20+
WIREPLUMBER_TARBALL=wireplumber-${WIREPLUMBER_VER}.tar.gz
21+
(
22+
cd /tmp \
23+
&& curl -L -o ${WIREPLUMBER_TARBALL} https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/${WIREPLUMBER_VER}/${WIREPLUMBER_TARBALL} \
24+
&& echo "e91f04cd8cec75d72b8a2aaa7e90b1ba0a5e2094b7a882fc3a29a484a48a87e9 ${WIREPLUMBER_TARBALL}" | sha256sum -c - \
25+
&& tar -xzf ${WIREPLUMBER_TARBALL} \
26+
&& cd wireplumber-${WIREPLUMBER_VER} \
27+
&& meson setup build -Ddoc=disabled -Dsystem-lua=true \
28+
&& meson compile -C build \
29+
&& meson install -C build \
30+
&& ldconfig \
31+
&& cd /tmp \
32+
&& rm -rf wireplumber-${WIREPLUMBER_VER} ${WIREPLUMBER_TARBALL}
33+
)
34+
1735
# # Add JDK to system paths.
1836
# echo "/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server" > /etc/ld.so.conf.d/openjdk.conf \
1937
# && ldconfig

0 commit comments

Comments
 (0)