Skip to content

Commit 663d585

Browse files
committed
Merge branch 'master' of github.com:audio4linux/JDSP4Linux
2 parents b659f68 + 6ae3d6d commit 663d585

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

.github/workflows/package-deb.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727

2828
- name: Install dependencies (PulseAudio flavor)
2929
run: |
30-
sudo apt install -y lftp pkg-config qtbase5-private-dev qtbase5-dev libqt5svg5-dev libglibmm-2.4-dev libglib2.0-dev libpulse-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev
30+
sudo apt install -y lftp pkg-config libarchive-dev qtbase5-private-dev qtbase5-dev libqt5svg5-dev libglibmm-2.4-dev libglib2.0-dev libpulse-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev
3131
3232
- name: Initialize project (PulseAudio flavor)
3333
run: qmake JDSP4Linux.pro "CONFIG += CI" "CONFIG += USE_PULSEAUDIO"
@@ -65,7 +65,7 @@ jobs:
6565
export PKG_CONFIG_PATH="/usr/lib/pkgconfig:$PATH"
6666
echo 'tzdata tzdata/Areas select Europe' | debconf-set-selections
6767
echo 'tzdata tzdata/Zones/Europe select Paris' | debconf-set-selections
68-
DEBIAN_FRONTEND="noninteractive" apt install -y tree make gcc g++ lftp pkg-config qtbase5-private-dev qtbase5-dev libqt5svg5-dev libglibmm-2.4-dev libglib2.0-dev libpipewire-0.3-dev
68+
DEBIAN_FRONTEND="noninteractive" apt install -y libarchive-dev tree make gcc g++ lftp pkg-config qtbase5-private-dev qtbase5-dev libqt5svg5-dev libglibmm-2.4-dev libglib2.0-dev libpipewire-0.3-dev
6969
7070
- name: Initialize project (PipeWire flavor)
7171
run: qmake JDSP4Linux.pro "CONFIG += CI"

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -196,39 +196,39 @@ For **PulseAudio clients** only:
196196
Debian/Ubuntu + **PipeWire** clients only:
197197

198198
```bash
199-
sudo apt install qtbase5-private-dev qtbase5-dev libqt5svg5-dev libglibmm-2.4-dev libglib2.0-dev libpipewire-0.3-dev
199+
sudo apt install libarchive-dev qtbase5-private-dev qtbase5-dev libqt5svg5-dev libglibmm-2.4-dev libglib2.0-dev libpipewire-0.3-dev
200200
```
201201
NOTE: Pipewire version 0.3 or later required. Unfortunately, this version is only in the official Ubuntu repository for Ubuntu 20.10 or later. If you use Ubuntu 20.04 or earlier, you need to compile this dependency yourself or use PulseAudio instead.
202202

203203
Debian/Ubuntu + **PulseAudio** clients only:
204204

205205
```bash
206-
sudo apt install qtbase5-private-dev qtbase5-dev libqt5svg5-dev libglibmm-2.4-dev libglib2.0-dev libpulse-dev libgstreamer1.0-dev libgstreamer-plugins-good1.0-dev
206+
sudo apt install libarchive-dev qtbase5-private-dev qtbase5-dev libqt5svg5-dev libglibmm-2.4-dev libglib2.0-dev libpulse-dev libgstreamer1.0-dev libgstreamer-plugins-good1.0-dev
207207
```
208208
**Fedora**
209209

210210
Fedora 34 + **PipeWire** clients only:
211211

212212
```bash
213-
sudo dnf install qt5-qtbase-devel qt5-qtbase-private-devel qt5-qtsvg-devel glibmm24-devel glib2-devel pipewire-devel
213+
sudo dnf install libarchive-devel qt5-qtbase-devel qt5-qtbase-private-devel qt5-qtsvg-devel glibmm24-devel glib2-devel pipewire-devel
214214
```
215215
Fedora 34 + **PulseAudio** clients only:
216216

217217
```bash
218-
sudo dnf install qt5-qtbase-devel qt5-qtbase-private-devel qt5-qtsvg-devel glibmm24-devel glib2-devel pulseaudio-libs-devel gstreamer1-devel gstreamer1-plugins-good-devel
218+
sudo dnf install libarchive-devel qt5-qtbase-devel qt5-qtbase-private-devel qt5-qtsvg-devel glibmm24-devel glib2-devel pulseaudio-libs-devel gstreamer1-devel gstreamer1-plugins-good-devel
219219
```
220220
**Arch Linux**
221221

222222
Arch Linux + **PipeWire** clients only:
223223

224224
```bash
225-
sudo pacman -S qt5-base qt5-svg glib2 glibmm pipewire
225+
sudo pacman -S libarchive qt5-base qt5-svg glib2 glibmm pipewire
226226
```
227227

228228
Arch Linux + **PulseAudio** clients only:
229229

230230
```
231-
sudo pacman -S qt5-base qt5-svg glib2 glibmm libpulse gst-plugins-good gstreamer
231+
sudo pacman -S libarchive qt5-base qt5-svg glib2 glibmm libpulse gst-plugins-good gstreamer
232232
```
233233

234234
#### Build application

meta/build_deb_package.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ conflict=""
55
deps=""
66
if [ $2 = "pipewire" ]; then
77
conflict="jamesdsp-pulse"
8-
deps="qtbase5-dev (>= 5.12.8), libqt5svg5 (>= 5.12.8), libglibmm-2.4-1v5, libglib2.0-0, libpipewire-0.3-0"
8+
deps="libarchive, qtbase5-dev (>= 5.12.8), libqt5svg5 (>= 5.12.8), libglibmm-2.4-1v5, libglib2.0-0, libpipewire-0.3-0"
99
elif [ $2 = "pulse" ]; then
1010
conflict="jamesdsp-pipewire"
11-
deps="qtbase5-dev (>= 5.12.8), libqt5svg5 (>= 5.12.8), libglibmm-2.4-1v5, libglib2.0-0, libpulse-mainloop-glib0, libgstreamer1.0-0, libgstreamer-plugins-good1.0-0"
11+
deps="libarchive, qtbase5-dev (>= 5.12.8), libqt5svg5 (>= 5.12.8), libglibmm-2.4-1v5, libglib2.0-0, libpulse-mainloop-glib0, libgstreamer1.0-0, libgstreamer-plugins-good1.0-0"
1212
else
1313
echo "ERROR: Unknown flavor"
1414
exit 1

0 commit comments

Comments
 (0)