Skip to content

Commit 645c571

Browse files
enzo1982enzo1982
committed
Update Snapcraft build configuration to use core24 base.
1 parent feb695b commit 645c571

File tree

1 file changed

+53
-49
lines changed

1 file changed

+53
-49
lines changed

‎snap/snapcraft.yaml

+53-49
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: freac
2-
base: core20
2+
base: core24
33
adopt-info: freac
44
summary: Audio converter and CD ripper
55
description: |
@@ -11,11 +11,15 @@ confinement: strict
1111

1212
icon: icons/freac.png
1313

14+
platforms:
15+
amd64:
16+
arm64:
17+
1418
apps:
1519
freac:
1620
command: bin/freac
1721
desktop: share/applications/org.freac.freac.desktop
18-
extensions: [ gnome-3-38 ]
22+
extensions: [ gnome ]
1923
plugs:
2024
- gsettings
2125
- home
@@ -26,7 +30,7 @@ apps:
2630

2731
freaccmd:
2832
command: bin/freaccmd
29-
extensions: [ gnome-3-38 ]
33+
extensions: [ gnome ]
3034
plugs:
3135
- home
3236
- network
@@ -65,11 +69,11 @@ parts:
6569
autotools-configure-parameters: [ --prefix=/usr ]
6670
build-environment:
6771
- PATH: "/usr/bin:$PATH"
68-
- CFLAGS: "$CFLAGS -O3 -funroll-loops"
72+
- CFLAGS: "${CFLAGS-} -O3 -funroll-loops"
6973
override-build: |
70-
patch -p1 < $SNAPCRAFT_STAGE/faad2-2.10.0-configure.patch
74+
patch -p1 < $CRAFT_STAGE/faad2-2.10.0-configure.patch
7175
chmod a+x configure
72-
snapcraftctl build
76+
craftctl default
7377
prime:
7478
- usr/lib/libfaad.so*
7579

@@ -79,10 +83,10 @@ parts:
7983
plugin: autotools
8084
autotools-configure-parameters: [ --prefix=/usr ]
8185
build-environment:
82-
- CXXFLAGS: "$CXXFLAGS -O3 -funroll-loops"
86+
- CXXFLAGS: "${CXXFLAGS-} -O3 -funroll-loops"
8387
override-build: |
8488
autoreconf -i
85-
snapcraftctl build
89+
craftctl default
8690
prime:
8791
- usr/lib/libfdk-aac.so*
8892

@@ -93,7 +97,7 @@ parts:
9397
plugin: autotools
9498
autotools-configure-parameters: [ --prefix=/usr, --disable-cpp-libs, --disable-vsx ]
9599
build-environment:
96-
- CFLAGS: "$CFLAGS -O3 -funroll-loops"
100+
- CFLAGS: "${CFLAGS-} -O3 -funroll-loops"
97101
prime:
98102
- usr/lib/libFLAC.so*
99103

@@ -104,13 +108,13 @@ parts:
104108
plugin: cmake
105109
cmake-parameters: [ -DCMAKE_INSTALL_PREFIX=/usr ]
106110
build-environment:
107-
- CXXFLAGS: "$CXXFLAGS -O3 -funroll-loops"
111+
- CXXFLAGS: "${CXXFLAGS-} -O3 -funroll-loops"
108112
override-build: |
109113
if [ `lscpu | grep -i 'byte order' | awk '{ print tolower($3) }'` = "little" ]; then
110-
snapcraftctl build
114+
craftctl default
111115
fi
112116
prime:
113-
- usr/lib/$SNAPCRAFT_ARCH_TRIPLET/libMAC.so*
117+
- usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libMAC.so*
114118

115119
libmp3lame:
116120
after: [ patches ]
@@ -119,12 +123,12 @@ parts:
119123
plugin: autotools
120124
autotools-configure-parameters: [ --prefix=/usr, --enable-nasm, --disable-frontend ]
121125
build-environment:
122-
- CFLAGS: "$CFLAGS -O3 -funroll-loops"
126+
- CFLAGS: "${CFLAGS-} -O3 -funroll-loops"
123127
override-build: |
124-
if [ "$SNAP_ARCH" = "amd64" ]; then
125-
patch -p0 < $SNAPCRAFT_STAGE/lame-3.100-sse-20171014.patch
128+
if [ "$CRAFT_ARCH_BUILD_FOR" = "amd64" ]; then
129+
patch -p0 < $CRAFT_STAGE/lame-3.100-sse-20171014.patch
126130
fi
127-
snapcraftctl build
131+
craftctl default
128132
prime:
129133
- usr/lib/libmp3lame.so*
130134

@@ -134,7 +138,7 @@ parts:
134138
plugin: autotools
135139
autotools-configure-parameters: [ --prefix=/usr ]
136140
build-environment:
137-
- CXXFLAGS: "$CXXFLAGS -Os"
141+
- CXXFLAGS: "${CXXFLAGS-} -Os"
138142
prime:
139143
- usr/lib/libmp4v2.so*
140144

@@ -143,20 +147,20 @@ parts:
143147
source-checksum: sha256/3c8919243707951cac0e3c39bbf28653bcaffc43c98ff16801a27350db8f0f21
144148
plugin: make
145149
build-environment:
146-
- CFLAGS: "$CFLAGS -O3 -funroll-loops"
150+
- CFLAGS: "${CFLAGS-} -O3 -funroll-loops"
147151
override-build: |
148-
if [ "$SNAP_ARCH" = "i386" ]; then
152+
if [ "$CRAFT_ARCH_BUILD_FOR" = "i386" ]; then
149153
./configure --prefix=/usr --with-cpu=sse
150-
elif [ "$SNAP_ARCH" = "amd64" ]; then
154+
elif [ "$CRAFT_ARCH_BUILD_FOR" = "amd64" ]; then
151155
./configure --prefix=/usr --with-cpu=x86-64
152-
elif [ "$SNAP_ARCH" = "armhf" ]; then
156+
elif [ "$CRAFT_ARCH_BUILD_FOR" = "armhf" ]; then
153157
./configure --prefix=/usr --with-cpu=neon
154-
elif [ "$SNAP_ARCH" = "arm64" ]; then
158+
elif [ "$CRAFT_ARCH_BUILD_FOR" = "arm64" ]; then
155159
./configure --prefix=/usr --with-cpu=neon64
156160
else
157161
./configure --prefix=/usr
158162
fi
159-
snapcraftctl build
163+
craftctl default
160164
prime:
161165
- usr/lib/libmpg123.so*
162166

@@ -167,7 +171,7 @@ parts:
167171
plugin: autotools
168172
autotools-configure-parameters: [ --prefix=/usr ]
169173
build-environment:
170-
- CFLAGS: "$CFLAGS -O3 -funroll-loops"
174+
- CFLAGS: "${CFLAGS-} -O3 -funroll-loops"
171175
prime:
172176
- usr/lib/libogg.so*
173177

@@ -176,14 +180,14 @@ parts:
176180
source-checksum: sha256/65c1d2f78b9f2fb20082c38cbe47c951ad5839345876e46941612ee87f9a7ce1
177181
plugin: make
178182
build-environment:
179-
- CFLAGS: "$CFLAGS -O3 -funroll-loops"
183+
- CFLAGS: "${CFLAGS-} -O3 -funroll-loops"
180184
override-build: |
181-
if [ "$SNAP_ARCH" = "armhf" ]; then
185+
if [ "$CRAFT_ARCH_BUILD_FOR" = "armhf" ]; then
182186
./configure --prefix=/usr --enable-float-approx --enable-osce --disable-intrinsics --disable-rtcd
183187
else
184188
./configure --prefix=/usr --enable-float-approx --enable-osce
185189
fi
186-
snapcraftctl build
190+
craftctl default
187191
prime:
188192
- usr/lib/libopus.so*
189193

@@ -193,10 +197,10 @@ parts:
193197
plugin: autotools
194198
autotools-configure-parameters: [ --prefix=/usr ]
195199
build-environment:
196-
- CFLAGS: "$CFLAGS -O3 -funroll-loops"
200+
- CFLAGS: "${CFLAGS-} -O3 -funroll-loops"
197201
override-build: |
198202
autoreconf -i
199-
snapcraftctl build
203+
craftctl default
200204
prime:
201205
- usr/lib/librnnoise.so*
202206

@@ -206,7 +210,7 @@ parts:
206210
plugin: autotools
207211
autotools-configure-parameters: [ --prefix=/usr ]
208212
build-environment:
209-
- CFLAGS: "$CFLAGS -O3 -funroll-loops"
213+
- CFLAGS: "${CFLAGS-} -O3 -funroll-loops"
210214
prime:
211215
- usr/lib/libspeex.so*
212216

@@ -217,13 +221,13 @@ parts:
217221
plugin: autotools
218222
autotools-configure-parameters: [ --prefix=/usr ]
219223
build-environment:
220-
- CFLAGS: "$CFLAGS -O3"
224+
- CFLAGS: "${CFLAGS-} -O3"
221225
override-build: |
222-
patch -p1 < $SNAPCRAFT_STAGE/libvorbis-1.3.7-aotuv-b6.03.patch
223-
if [ "$SNAP_ARCH" = "amd64" ]; then
224-
patch -p1 < $SNAPCRAFT_STAGE/libvorbis-1.3.7-aotuv-b6.03-lancer.patch
226+
patch -p1 < $CRAFT_STAGE/libvorbis-1.3.7-aotuv-b6.03.patch
227+
if [ "$CRAFT_ARCH_BUILD_FOR" = "amd64" ]; then
228+
patch -p1 < $CRAFT_STAGE/libvorbis-1.3.7-aotuv-b6.03-lancer.patch
225229
fi
226-
snapcraftctl build
230+
craftctl default
227231
prime:
228232
- usr/lib/libvorbis*.so*
229233

@@ -243,26 +247,26 @@ parts:
243247
- gnome-icon-theme
244248
override-prime: |
245249
mkdir -p share/icons/gnome/32x32/status
246-
cp $SNAPCRAFT_STAGE/usr/share/icons/gnome/32x32/status/dialog-error.png share/icons/gnome/32x32/status
247-
cp $SNAPCRAFT_STAGE/usr/share/icons/gnome/32x32/status/dialog-information.png share/icons/gnome/32x32/status
248-
cp $SNAPCRAFT_STAGE/usr/share/icons/gnome/32x32/status/dialog-question.png share/icons/gnome/32x32/status
249-
cp $SNAPCRAFT_STAGE/usr/share/icons/gnome/32x32/status/dialog-warning.png share/icons/gnome/32x32/status
250+
cp $CRAFT_STAGE/usr/share/icons/gnome/32x32/status/dialog-error.png share/icons/gnome/32x32/status
251+
cp $CRAFT_STAGE/usr/share/icons/gnome/32x32/status/dialog-information.png share/icons/gnome/32x32/status
252+
cp $CRAFT_STAGE/usr/share/icons/gnome/32x32/status/dialog-question.png share/icons/gnome/32x32/status
253+
cp $CRAFT_STAGE/usr/share/icons/gnome/32x32/status/dialog-warning.png share/icons/gnome/32x32/status
250254
251255
smooth:
252256
after: [ patches ]
253257
source: https://github.com/enzo1982/smooth.git
254258
plugin: make
255259
make-parameters: [ prefix= ]
256260
build-environment:
257-
- CXXFLAGS: "$CXXFLAGS -g0 -Os -fno-rtti -fno-exceptions"
261+
- CXXFLAGS: "${CXXFLAGS-} -g0 -Os -fno-rtti -fno-exceptions"
258262
build-packages:
259263
- libbz2-dev
260264
- libcurl4-gnutls-dev
261265
- libfribidi-dev
262266
- libjpeg8-dev
263267
- libxml2-dev
264268
stage-packages:
265-
- libcurl3-gnutls
269+
- libcurl3t64-gnutls
266270
- libfribidi0
267271

268272
boca:
@@ -271,10 +275,10 @@ parts:
271275
plugin: make
272276
make-parameters: [ prefix= ]
273277
build-environment:
274-
- CXXFLAGS: "$CXXFLAGS -g0 -Os -fno-rtti -fno-exceptions"
278+
- CXXFLAGS: "${CXXFLAGS-} -g0 -Os -fno-rtti -fno-exceptions"
275279
override-build: |
276-
patch -p1 < $SNAPCRAFT_STAGE/boca-1.1.8-pre-snap.patch
277-
snapcraftctl build
280+
patch -p1 < $CRAFT_STAGE/boca-1.1.8-pre-snap.patch
281+
craftctl default
278282
build-packages:
279283
- libexpat1-dev
280284
- libpulse-dev
@@ -291,13 +295,13 @@ parts:
291295
plugin: make
292296
make-parameters: [ prefix= ]
293297
build-environment:
294-
- CXXFLAGS: "$CXXFLAGS -g0 -Os -fno-rtti -fno-exceptions -DFREAC_DATE=\\\\\\\"`date +\"%Y%m%d\"`\\\\\\\""
298+
- CXXFLAGS: "${CXXFLAGS-} -g0 -Os -fno-rtti -fno-exceptions -DFREAC_DATE=\\\\\\\"`date +\"%Y%m%d\"`\\\\\\\""
295299
override-pull: |
296-
snapcraftctl pull
297-
snapcraftctl set-version "$(echo 1.1.7~`date +"%Y%m%d"`)"
300+
craftctl default
301+
craftctl set version=$(echo 1.1.7~`date +"%Y%m%d"`)
298302
sed -i -e 's|Icon=org.freac.freac|Icon=${SNAP}/share/icons/hicolor/128x128/apps/org.freac.freac.png|g' metadata/org.freac.freac.desktop
299303
override-build: |
300-
patch -p1 < $SNAPCRAFT_STAGE/freac-1.1.6-pre-snap.patch
301-
snapcraftctl build
304+
patch -p1 < $CRAFT_STAGE/freac-1.1.6-pre-snap.patch
305+
craftctl default
302306
build-packages:
303307
- libudev-dev

0 commit comments

Comments
 (0)