Skip to content

Commit 2c533af

Browse files
autotools: Drop support in favor of Meson
See also: https://github.com/orgs/audacious-media-player/discussions/1749
1 parent fd34291 commit 2c533af

117 files changed

Lines changed: 26 additions & 10101 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/actions/install-dependencies/action.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,13 @@ author: 'Audacious developers'
44

55
inputs:
66
os:
7-
description: 'The operating system to use (like ubuntu-22.04)'
8-
required: True
9-
build-system:
10-
description: 'The build system to use (autotools or meson)'
7+
description: 'The operating system to use (like ubuntu-24.04)'
118
required: True
129

1310
runs:
1411
using: "composite"
1512
steps:
16-
- run: '$GITHUB_ACTION_PATH/install-dependencies.sh "${{ inputs.os }}" "${{ inputs.build-system }}"'
13+
- run: '$GITHUB_ACTION_PATH/install-dependencies.sh "${{ inputs.os }}"'
1714
if: (!startsWith(inputs.os, 'windows'))
1815
shell: bash
1916

@@ -23,7 +20,6 @@ runs:
2320
msystem: UCRT64
2421
update: true
2522
install: >-
26-
mingw-w64-ucrt-x86_64-autotools
2723
mingw-w64-ucrt-x86_64-faad2
2824
mingw-w64-ucrt-x86_64-ffmpeg
2925
mingw-w64-ucrt-x86_64-flac

.github/actions/install-dependencies/install-dependencies.sh

Lines changed: 8 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,8 @@
99
# macOS 26: Qt 6 - GTK
1010

1111
os=$(tr '[:upper:]' '[:lower:]' <<< "$1")
12-
build_system=$(tr '[:upper:]' '[:lower:]' <<< "$2")
1312

14-
if [ -z "$os" ] || [ -z "$build_system" ]; then
13+
if [ -z "$os" ]; then
1514
echo 'Invalid or missing input parameters'
1615
exit 1
1716
fi
@@ -24,46 +23,31 @@ ubuntu_packages='gettext libadplug-dev libasound2-dev libavformat-dev
2423
libmpg123-dev libneon27-gnutls-dev libnotify-dev libopenmpt-dev
2524
libopusfile-dev libpipewire-0.3-dev libpulse-dev
2625
libsamplerate0-dev libsdl2-dev libsidplayfp-dev libsndfile1-dev
27-
libsndio-dev libsoxr-dev libvorbis-dev libwavpack-dev libxml2-dev'
26+
libsndio-dev libsoxr-dev libvorbis-dev libwavpack-dev libxml2-dev
27+
meson'
2828

2929
ubuntu_qt5_packages='libqt5opengl5-dev libqt5svg5-dev libqt5x11extras5-dev
3030
qtbase5-dev qtmultimedia5-dev'
3131
ubuntu_qt6_packages='qt6-base-dev qt6-multimedia-dev qt6-svg-dev'
3232

3333
macos_packages='adplug faad2 ffmpeg libbs2b libcue libmms libmodplug libnotify
34-
libopenmpt libsamplerate libsoxr neon opusfile sdl3 wavpack'
34+
libopenmpt libsamplerate libsoxr meson neon opusfile sdl3 wavpack'
3535

3636
case "$os" in
3737
ubuntu-22.04)
38-
if [ "$build_system" = 'meson' ]; then
39-
sudo apt-get -qq update && sudo apt-get install $ubuntu_packages $ubuntu_qt5_packages libgtk2.0-dev liblircclient-dev meson
40-
else
41-
sudo apt-get -qq update && sudo apt-get install $ubuntu_packages $ubuntu_qt5_packages libgtk2.0-dev liblircclient-dev
42-
fi
38+
sudo apt-get -qq update && sudo apt-get install $ubuntu_packages $ubuntu_qt5_packages libgtk2.0-dev liblircclient-dev
4339
;;
4440

4541
ubuntu*)
46-
if [ "$build_system" = 'meson' ]; then
47-
sudo apt-get -qq update && sudo apt-get install $ubuntu_packages $ubuntu_qt6_packages libgtk-3-dev liblirc-dev meson
48-
else
49-
sudo apt-get -qq update && sudo apt-get install $ubuntu_packages $ubuntu_qt6_packages libgtk-3-dev liblirc-dev
50-
fi
42+
sudo apt-get -qq update && sudo apt-get install $ubuntu_packages $ubuntu_qt6_packages libgtk-3-dev liblirc-dev
5143
;;
5244

5345
macos-15*)
54-
if [ "$build_system" = 'meson' ]; then
55-
brew update -q && brew install $macos_packages qt@5 meson
56-
else
57-
brew update -q && brew install $macos_packages qt@5 automake libiconv
58-
fi
46+
brew update -q && brew install $macos_packages qt@5
5947
;;
6048

6149
macos*)
62-
if [ "$build_system" = 'meson' ]; then
63-
brew update -q && brew install $macos_packages qt@6 meson
64-
else
65-
brew update -q && brew install $macos_packages qt@6 automake libiconv
66-
fi
50+
brew update -q && brew install $macos_packages qt@6
6751
;;
6852

6953
windows*)

.github/actions/run-action/action.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,16 @@ inputs:
77
description: 'The build action to run (configure, build or install)'
88
required: True
99
os:
10-
description: 'The operating system to use (like ubuntu-22.04)'
11-
required: True
12-
build-system:
13-
description: 'The build system to use (autotools or meson)'
10+
description: 'The operating system to use (like ubuntu-24.04)'
1411
required: True
1512

1613
runs:
1714
using: "composite"
1815
steps:
19-
- run: '$GITHUB_ACTION_PATH/run-action.sh "${{ inputs.action }}" "${{ inputs.os }}" "${{ inputs.build-system }}"'
16+
- run: '$GITHUB_ACTION_PATH/run-action.sh "${{ inputs.action }}" "${{ inputs.os }}"'
2017
if: (!startsWith(inputs.os, 'windows'))
2118
shell: bash
2219

23-
- run: '$GITHUB_ACTION_PATH/run-action.sh "${{ inputs.action }}" "${{ inputs.os }}" "${{ inputs.build-system }}"'
20+
- run: '$GITHUB_ACTION_PATH/run-action.sh "${{ inputs.action }}" "${{ inputs.os }}"'
2421
if: startsWith(inputs.os, 'windows')
2522
shell: msys2 {0}

.github/actions/run-action/run-action.sh

Lines changed: 8 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@
1010

1111
action=$(tr '[:upper:]' '[:lower:]' <<< "$1")
1212
os=$(tr '[:upper:]' '[:lower:]' <<< "$2")
13-
build_system=$(tr '[:upper:]' '[:lower:]' <<< "$3")
1413

15-
if [ -z "$action" ] || [ -z "$os" ] || [ -z "$build_system" ]; then
14+
if [ -z "$action" ] || [ -z "$os" ]; then
1615
echo 'Invalid or missing input parameters'
1716
exit 1
1817
fi
@@ -25,55 +24,27 @@ case "$action" in
2524
configure)
2625
case "$os" in
2726
ubuntu-22.04)
28-
if [ "$build_system" = 'meson' ]; then
29-
meson setup build -D qt5=true -D gtk2=true
30-
else
31-
./autogen.sh && ./configure --enable-qt5 --enable-gtk2
32-
fi
27+
meson setup build -D qt5=true -D gtk2=true
3328
;;
3429

3530
ubuntu*)
36-
if [ "$build_system" = 'meson' ]; then
37-
meson setup build
38-
else
39-
./autogen.sh && ./configure
40-
fi
31+
meson setup build
4132
;;
4233

4334
macos-15*)
4435
export PATH="/usr/local/opt/qt@5/bin:$PATH"
4536
export PKG_CONFIG_PATH="/usr/local/opt/qt@5/lib/pkgconfig:$PKG_CONFIG_PATH"
46-
47-
if [ "$build_system" = 'meson' ]; then
48-
meson setup build -D qt5=true -D gtk=false
49-
else
50-
export LDFLAGS="-L/usr/local/opt/libiconv/lib"
51-
export CPPFLAGS="-I/usr/local/opt/libiconv/include"
52-
autoreconf -I "/usr/local/share/gettext/m4" &&
53-
./configure --enable-qt5 --disable-gtk
54-
fi
37+
meson setup build -D qt5=true -D gtk=false
5538
;;
5639

5740
macos*)
5841
export PATH="/opt/homebrew/opt/qt@6/bin:$PATH"
5942
export PKG_CONFIG_PATH="/opt/homebrew/opt/qt@6/libexec/lib/pkgconfig:$PKG_CONFIG_PATH"
60-
61-
if [ "$build_system" = 'meson' ]; then
62-
meson setup build -D gtk=false
63-
else
64-
export LDFLAGS="-L/opt/homebrew/opt/libiconv/lib"
65-
export CPPFLAGS="-I/opt/homebrew/opt/libiconv/include"
66-
autoreconf -I "/opt/homebrew/opt/gettext/share/gettext/m4" &&
67-
./configure --disable-gtk
68-
fi
43+
meson setup build -D gtk=false
6944
;;
7045

7146
windows*)
72-
if [ "$build_system" = 'meson' ]; then
73-
meson setup build -D gtk2=true
74-
else
75-
./autogen.sh && ./configure --enable-gtk2
76-
fi
47+
meson setup build -D gtk2=true
7748
;;
7849

7950
*)
@@ -84,21 +55,11 @@ case "$action" in
8455
;;
8556

8657
build)
87-
if [ "$build_system" = 'meson' ]; then
88-
meson compile -C build
89-
elif [[ "$os" == macos* ]]; then
90-
make -j$(sysctl -n hw.logicalcpu)
91-
else
92-
make -j$(nproc)
93-
fi
58+
meson compile -C build
9459
;;
9560

9661
install)
97-
if [ "$build_system" = 'meson' ]; then
98-
$_sudo meson install -C build
99-
else
100-
$_sudo make install
101-
fi
62+
$_sudo meson install -C build
10263
;;
10364

10465
*)

.github/workflows/c-cpp.yml

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,15 @@ jobs:
1313
os: [ubuntu-22.04, ubuntu-24.04,
1414
macos-15-intel, macos-26,
1515
windows-2022]
16-
build-system: [autotools, meson]
17-
exclude:
18-
- os: macos-26
19-
build-system: autotools
2016
fail-fast: false
2117
runs-on: ${{ matrix.os }}
2218

2319
steps:
2420
- name: Checkout audacious-plugins
25-
uses: actions/checkout@v5
21+
uses: actions/checkout@v6
2622

2723
- name: Checkout audacious
28-
uses: actions/checkout@v5
24+
uses: actions/checkout@v6
2925
with:
3026
repository: audacious-media-player/audacious
3127
path: audacious
@@ -34,46 +30,39 @@ jobs:
3430
uses: ./.github/actions/install-dependencies
3531
with:
3632
os: ${{ matrix.os }}
37-
build-system: ${{ matrix.build-system }}
3833

3934
- name: Configure audacious
4035
uses: ./audacious/.github/actions/run-action
4136
with:
4237
action: 'configure'
4338
os: ${{ matrix.os }}
44-
build-system: ${{ matrix.build-system }}
4539

4640
- name: Build audacious
4741
uses: ./audacious/.github/actions/run-action
4842
with:
4943
action: 'build'
5044
os: ${{ matrix.os }}
51-
build-system: ${{ matrix.build-system }}
5245

5346
- name: Install audacious
5447
uses: ./audacious/.github/actions/run-action
5548
with:
5649
action: 'install'
5750
os: ${{ matrix.os }}
58-
build-system: ${{ matrix.build-system }}
5951

6052
- name: Configure audacious-plugins
6153
uses: ./.github/actions/run-action
6254
with:
6355
action: 'configure'
6456
os: ${{ matrix.os }}
65-
build-system: ${{ matrix.build-system }}
6657

6758
- name: Build audacious-plugins
6859
uses: ./.github/actions/run-action
6960
with:
7061
action: 'build'
7162
os: ${{ matrix.os }}
72-
build-system: ${{ matrix.build-system }}
7363

7464
- name: Install audacious-plugins
7565
uses: ./.github/actions/run-action
7666
with:
7767
action: 'install'
7868
os: ${{ matrix.os }}
79-
build-system: ${{ matrix.build-system }}

0 commit comments

Comments
 (0)