Skip to content

Commit b440a02

Browse files
authored
Update FLTK in the AppImage (LMMS#7710)
Bump fltk 1.3.x->1.4.1 Closes LMMS#5386
1 parent 24bda4f commit b440a02

File tree

3 files changed

+38
-2
lines changed

3 files changed

+38
-2
lines changed

.github/workflows/build.yml

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,13 @@ jobs:
2525
with:
2626
fetch-depth: 0
2727
submodules: recursive
28+
- name: Clone fltk
29+
uses: actions/checkout@v4
30+
with:
31+
repository: fltk/fltk
32+
path: fltk
33+
ref: 27d991f046bdebb12bfd58f7c05a19f135979c29
34+
fetch-depth: 1
2835
- name: Configure winehq
2936
run: |
3037
sudo dpkg --add-architecture i386
@@ -37,8 +44,10 @@ jobs:
3744
run: |
3845
sudo apt-get update -y
3946
sudo apt-get install -y --no-install-recommends \
40-
$(xargs < .github/workflows/deps-ubuntu-24.04-gcc.txt)
47+
$(xargs < .github/workflows/deps-ubuntu-24.04-gcc.txt)
4148
sudo apt-get install -y --install-recommends g++-multilib gcc-multilib winehq-stable wine-stable-dev
49+
sudo apt-get install -y --install-recommends \
50+
$(xargs < .github/workflows/deps-ubuntu-24.04-fltk.txt)
4251
- name: Cache ccache data
4352
uses: actions/cache@v3
4453
with:
@@ -47,6 +56,14 @@ jobs:
4756
ccache-${{ github.job }}-${{ github.ref }}-
4857
ccache-${{ github.job }}-
4958
path: ~/.ccache
59+
- name: Configure fltk
60+
run: |
61+
cmake -S fltk -B fltk/build -DFLTK_BUILD_SHARED_LIBS=ON -DFLTK_BACKEND_WAYLAND=ON \
62+
-DFLTK_USE_LIBDECOR_GTK=OFF -DFLTK_BUILD_TEST=OFF -DFLTK_BUILD_GL=OFF
63+
- name: Install fltk
64+
run: |
65+
cmake --build fltk/build
66+
sudo cmake --install fltk/build --prefix /usr
5067
- name: Configure
5168
run: |
5269
ccache --zero-stats
@@ -98,11 +115,20 @@ jobs:
98115
with:
99116
fetch-depth: 0
100117
submodules: recursive
118+
- name: Clone fltk
119+
uses: actions/checkout@v4
120+
with:
121+
repository: fltk/fltk
122+
path: fltk
123+
ref: 27d991f046bdebb12bfd58f7c05a19f135979c29
124+
fetch-depth: 1
101125
- name: Install system packages
102126
run: |
103127
sudo apt-get update -y
104128
sudo apt-get install -y --no-install-recommends \
105129
$(xargs < .github/workflows/deps-ubuntu-24.04-gcc.txt)
130+
sudo apt-get install -y --install-recommends \
131+
$(xargs < .github/workflows/deps-ubuntu-24.04-fltk.txt)
106132
- name: Cache ccache data
107133
uses: actions/cache@v3
108134
with:
@@ -111,6 +137,14 @@ jobs:
111137
ccache-${{ github.job }}-${{ github.ref }}-
112138
ccache-${{ github.job }}-
113139
path: ~/.ccache
140+
- name: Configure fltk
141+
run: |
142+
cmake -S fltk -B fltk/build -DFLTK_BUILD_SHARED_LIBS=ON -DFLTK_BACKEND_WAYLAND=ON \
143+
-DFLTK_USE_LIBDECOR_GTK=OFF -DFLTK_BUILD_TEST=OFF -DFLTK_BUILD_GL=OFF
144+
- name: Install fltk
145+
run: |
146+
cmake --build fltk/build
147+
sudo cmake --install fltk/build --prefix /usr
114148
- name: Configure
115149
run: |
116150
ccache --zero-stats
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
libcairo2-dev
2+
libpango1.0-dev
3+
wayland-protocols

.github/workflows/deps-ubuntu-24.04-gcc.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ g++
1111
libasound2-dev
1212
libc6-dev
1313
libfftw3-dev
14-
libfltk1.3-dev
1514
libfluidsynth-dev
1615
libgig-dev
1716
libgtk2.0-0

0 commit comments

Comments
 (0)