Skip to content

Commit 44b1313

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

File tree

1 file changed

+48
-48
lines changed

1 file changed

+48
-48
lines changed

‎snap/snapcraft.yaml

+48-48
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: |
@@ -15,7 +15,7 @@ apps:
1515
freac:
1616
command: bin/freac
1717
desktop: share/applications/org.freac.freac.desktop
18-
extensions: [ gnome-3-38 ]
18+
extensions: [ gnome ]
1919
plugs:
2020
- gsettings
2121
- home
@@ -26,7 +26,7 @@ apps:
2626

2727
freaccmd:
2828
command: bin/freaccmd
29-
extensions: [ gnome-3-38 ]
29+
extensions: [ gnome ]
3030
plugs:
3131
- home
3232
- network
@@ -65,11 +65,11 @@ parts:
6565
autotools-configure-parameters: [ --prefix=/usr ]
6666
build-environment:
6767
- PATH: "/usr/bin:$PATH"
68-
- CFLAGS: "$CFLAGS -O3 -funroll-loops"
68+
- CFLAGS: "${CFLAGS-} -O3 -funroll-loops"
6969
override-build: |
70-
patch -p1 < $SNAPCRAFT_STAGE/faad2-2.10.0-configure.patch
70+
patch -p1 < $CRAFT_STAGE/faad2-2.10.0-configure.patch
7171
chmod a+x configure
72-
snapcraftctl build
72+
craftctl default
7373
prime:
7474
- usr/lib/libfaad.so*
7575

@@ -79,10 +79,10 @@ parts:
7979
plugin: autotools
8080
autotools-configure-parameters: [ --prefix=/usr ]
8181
build-environment:
82-
- CXXFLAGS: "$CXXFLAGS -O3 -funroll-loops"
82+
- CXXFLAGS: "${CXXFLAGS-} -O3 -funroll-loops"
8383
override-build: |
8484
autoreconf -i
85-
snapcraftctl build
85+
craftctl default
8686
prime:
8787
- usr/lib/libfdk-aac.so*
8888

@@ -93,7 +93,7 @@ parts:
9393
plugin: autotools
9494
autotools-configure-parameters: [ --prefix=/usr, --disable-cpp-libs, --disable-vsx ]
9595
build-environment:
96-
- CFLAGS: "$CFLAGS -O3 -funroll-loops"
96+
- CFLAGS: "${CFLAGS-} -O3 -funroll-loops"
9797
prime:
9898
- usr/lib/libFLAC.so*
9999

@@ -104,13 +104,13 @@ parts:
104104
plugin: cmake
105105
cmake-parameters: [ -DCMAKE_INSTALL_PREFIX=/usr ]
106106
build-environment:
107-
- CXXFLAGS: "$CXXFLAGS -O3 -funroll-loops"
107+
- CXXFLAGS: "${CXXFLAGS-} -O3 -funroll-loops"
108108
override-build: |
109109
if [ `lscpu | grep -i 'byte order' | awk '{ print tolower($3) }'` = "little" ]; then
110-
snapcraftctl build
110+
craftctl default
111111
fi
112112
prime:
113-
- usr/lib/$SNAPCRAFT_ARCH_TRIPLET/libMAC.so*
113+
- usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libMAC.so*
114114

115115
libmp3lame:
116116
after: [ patches ]
@@ -119,12 +119,12 @@ parts:
119119
plugin: autotools
120120
autotools-configure-parameters: [ --prefix=/usr, --enable-nasm, --disable-frontend ]
121121
build-environment:
122-
- CFLAGS: "$CFLAGS -O3 -funroll-loops"
122+
- CFLAGS: "${CFLAGS-} -O3 -funroll-loops"
123123
override-build: |
124-
if [ "$SNAP_ARCH" = "amd64" ]; then
125-
patch -p0 < $SNAPCRAFT_STAGE/lame-3.100-sse-20171014.patch
124+
if [ "$CRAFT_ARCH_BUILD_FOR" = "amd64" ]; then
125+
patch -p0 < $CRAFT_STAGE/lame-3.100-sse-20171014.patch
126126
fi
127-
snapcraftctl build
127+
craftctl default
128128
prime:
129129
- usr/lib/libmp3lame.so*
130130

@@ -134,7 +134,7 @@ parts:
134134
plugin: autotools
135135
autotools-configure-parameters: [ --prefix=/usr ]
136136
build-environment:
137-
- CXXFLAGS: "$CXXFLAGS -Os"
137+
- CXXFLAGS: "${CXXFLAGS-} -Os"
138138
prime:
139139
- usr/lib/libmp4v2.so*
140140

@@ -143,20 +143,20 @@ parts:
143143
source-checksum: sha256/3c8919243707951cac0e3c39bbf28653bcaffc43c98ff16801a27350db8f0f21
144144
plugin: make
145145
build-environment:
146-
- CFLAGS: "$CFLAGS -O3 -funroll-loops"
146+
- CFLAGS: "${CFLAGS-} -O3 -funroll-loops"
147147
override-build: |
148-
if [ "$SNAP_ARCH" = "i386" ]; then
148+
if [ "$CRAFT_ARCH_BUILD_FOR" = "i386" ]; then
149149
./configure --prefix=/usr --with-cpu=sse
150-
elif [ "$SNAP_ARCH" = "amd64" ]; then
150+
elif [ "$CRAFT_ARCH_BUILD_FOR" = "amd64" ]; then
151151
./configure --prefix=/usr --with-cpu=x86-64
152-
elif [ "$SNAP_ARCH" = "armhf" ]; then
152+
elif [ "$CRAFT_ARCH_BUILD_FOR" = "armhf" ]; then
153153
./configure --prefix=/usr --with-cpu=neon
154-
elif [ "$SNAP_ARCH" = "arm64" ]; then
154+
elif [ "$CRAFT_ARCH_BUILD_FOR" = "arm64" ]; then
155155
./configure --prefix=/usr --with-cpu=neon64
156156
else
157157
./configure --prefix=/usr
158158
fi
159-
snapcraftctl build
159+
craftctl default
160160
prime:
161161
- usr/lib/libmpg123.so*
162162

@@ -167,7 +167,7 @@ parts:
167167
plugin: autotools
168168
autotools-configure-parameters: [ --prefix=/usr ]
169169
build-environment:
170-
- CFLAGS: "$CFLAGS -O3 -funroll-loops"
170+
- CFLAGS: "${CFLAGS-} -O3 -funroll-loops"
171171
prime:
172172
- usr/lib/libogg.so*
173173

@@ -176,14 +176,14 @@ parts:
176176
source-checksum: sha256/65c1d2f78b9f2fb20082c38cbe47c951ad5839345876e46941612ee87f9a7ce1
177177
plugin: make
178178
build-environment:
179-
- CFLAGS: "$CFLAGS -O3 -funroll-loops"
179+
- CFLAGS: "${CFLAGS-} -O3 -funroll-loops"
180180
override-build: |
181-
if [ "$SNAP_ARCH" = "armhf" ]; then
181+
if [ "$CRAFT_ARCH_BUILD_FOR" = "armhf" ]; then
182182
./configure --prefix=/usr --enable-float-approx --enable-osce --disable-intrinsics --disable-rtcd
183183
else
184184
./configure --prefix=/usr --enable-float-approx --enable-osce
185185
fi
186-
snapcraftctl build
186+
craftctl default
187187
prime:
188188
- usr/lib/libopus.so*
189189

@@ -193,10 +193,10 @@ parts:
193193
plugin: autotools
194194
autotools-configure-parameters: [ --prefix=/usr ]
195195
build-environment:
196-
- CFLAGS: "$CFLAGS -O3 -funroll-loops"
196+
- CFLAGS: "${CFLAGS-} -O3 -funroll-loops"
197197
override-build: |
198198
autoreconf -i
199-
snapcraftctl build
199+
craftctl default
200200
prime:
201201
- usr/lib/librnnoise.so*
202202

@@ -206,7 +206,7 @@ parts:
206206
plugin: autotools
207207
autotools-configure-parameters: [ --prefix=/usr ]
208208
build-environment:
209-
- CFLAGS: "$CFLAGS -O3 -funroll-loops"
209+
- CFLAGS: "${CFLAGS-} -O3 -funroll-loops"
210210
prime:
211211
- usr/lib/libspeex.so*
212212

@@ -217,13 +217,13 @@ parts:
217217
plugin: autotools
218218
autotools-configure-parameters: [ --prefix=/usr ]
219219
build-environment:
220-
- CFLAGS: "$CFLAGS -O3"
220+
- CFLAGS: "${CFLAGS-} -O3"
221221
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
222+
patch -p1 < $CRAFT_STAGE/libvorbis-1.3.7-aotuv-b6.03.patch
223+
if [ "$CRAFT_ARCH_BUILD_FOR" = "amd64" ]; then
224+
patch -p1 < $CRAFT_STAGE/libvorbis-1.3.7-aotuv-b6.03-lancer.patch
225225
fi
226-
snapcraftctl build
226+
craftctl default
227227
prime:
228228
- usr/lib/libvorbis*.so*
229229

@@ -243,18 +243,18 @@ parts:
243243
- gnome-icon-theme
244244
override-prime: |
245245
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
246+
cp $CRAFT_STAGE/usr/share/icons/gnome/32x32/status/dialog-error.png share/icons/gnome/32x32/status
247+
cp $CRAFT_STAGE/usr/share/icons/gnome/32x32/status/dialog-information.png share/icons/gnome/32x32/status
248+
cp $CRAFT_STAGE/usr/share/icons/gnome/32x32/status/dialog-question.png share/icons/gnome/32x32/status
249+
cp $CRAFT_STAGE/usr/share/icons/gnome/32x32/status/dialog-warning.png share/icons/gnome/32x32/status
250250
251251
smooth:
252252
after: [ patches ]
253253
source: https://github.com/enzo1982/smooth.git
254254
plugin: make
255255
make-parameters: [ prefix= ]
256256
build-environment:
257-
- CXXFLAGS: "$CXXFLAGS -g0 -Os -fno-rtti -fno-exceptions"
257+
- CXXFLAGS: "${CXXFLAGS-} -g0 -Os -fno-rtti -fno-exceptions"
258258
build-packages:
259259
- libbz2-dev
260260
- libcurl4-gnutls-dev
@@ -271,10 +271,10 @@ parts:
271271
plugin: make
272272
make-parameters: [ prefix= ]
273273
build-environment:
274-
- CXXFLAGS: "$CXXFLAGS -g0 -Os -fno-rtti -fno-exceptions"
274+
- CXXFLAGS: "${CXXFLAGS-} -g0 -Os -fno-rtti -fno-exceptions"
275275
override-build: |
276-
patch -p1 < $SNAPCRAFT_STAGE/boca-1.1.8-pre-snap.patch
277-
snapcraftctl build
276+
patch -p1 < $CRAFT_STAGE/boca-1.1.8-pre-snap.patch
277+
craftctl default
278278
build-packages:
279279
- libexpat1-dev
280280
- libpulse-dev
@@ -291,13 +291,13 @@ parts:
291291
plugin: make
292292
make-parameters: [ prefix= ]
293293
build-environment:
294-
- CXXFLAGS: "$CXXFLAGS -g0 -Os -fno-rtti -fno-exceptions -DFREAC_DATE=\\\\\\\"`date +\"%Y%m%d\"`\\\\\\\""
294+
- CXXFLAGS: "${CXXFLAGS-} -g0 -Os -fno-rtti -fno-exceptions -DFREAC_DATE=\\\\\\\"`date +\"%Y%m%d\"`\\\\\\\""
295295
override-pull: |
296-
snapcraftctl pull
297-
snapcraftctl set-version "$(echo 1.1.7~`date +"%Y%m%d"`)"
296+
craftctl default
297+
craftctl set version=$(echo 1.1.7~`date +"%Y%m%d"`)
298298
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
299299
override-build: |
300-
patch -p1 < $SNAPCRAFT_STAGE/freac-1.1.6-pre-snap.patch
301-
snapcraftctl build
300+
patch -p1 < $CRAFT_STAGE/freac-1.1.6-pre-snap.patch
301+
craftctl default
302302
build-packages:
303303
- libudev-dev

0 commit comments

Comments
 (0)