diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index c3dfdf69..60911449 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -1,5 +1,5 @@ name: freac -base: core20 +base: core24 adopt-info: freac summary: Audio converter and CD ripper description: | @@ -11,11 +11,15 @@ confinement: strict icon: icons/freac.png +platforms: + amd64: + arm64: + apps: freac: command: bin/freac desktop: share/applications/org.freac.freac.desktop - extensions: [ gnome-3-38 ] + extensions: [ gnome ] plugs: - gsettings - home @@ -26,7 +30,7 @@ apps: freaccmd: command: bin/freaccmd - extensions: [ gnome-3-38 ] + extensions: [ gnome ] plugs: - home - network @@ -65,11 +69,11 @@ parts: autotools-configure-parameters: [ --prefix=/usr ] build-environment: - PATH: "/usr/bin:$PATH" - - CFLAGS: "$CFLAGS -O3 -funroll-loops" + - CFLAGS: "${CFLAGS-} -O3 -funroll-loops" override-build: | - patch -p1 < $SNAPCRAFT_STAGE/faad2-2.10.0-configure.patch + patch -p1 < $CRAFT_STAGE/faad2-2.10.0-configure.patch chmod a+x configure - snapcraftctl build + craftctl default prime: - usr/lib/libfaad.so* @@ -79,10 +83,10 @@ parts: plugin: autotools autotools-configure-parameters: [ --prefix=/usr ] build-environment: - - CXXFLAGS: "$CXXFLAGS -O3 -funroll-loops" + - CXXFLAGS: "${CXXFLAGS-} -O3 -funroll-loops" override-build: | autoreconf -i - snapcraftctl build + craftctl default prime: - usr/lib/libfdk-aac.so* @@ -93,7 +97,7 @@ parts: plugin: autotools autotools-configure-parameters: [ --prefix=/usr, --disable-cpp-libs, --disable-vsx ] build-environment: - - CFLAGS: "$CFLAGS -O3 -funroll-loops" + - CFLAGS: "${CFLAGS-} -O3 -funroll-loops" prime: - usr/lib/libFLAC.so* @@ -104,13 +108,13 @@ parts: plugin: cmake cmake-parameters: [ -DCMAKE_INSTALL_PREFIX=/usr ] build-environment: - - CXXFLAGS: "$CXXFLAGS -O3 -funroll-loops" + - CXXFLAGS: "${CXXFLAGS-} -O3 -funroll-loops" override-build: | if [ `lscpu | grep -i 'byte order' | awk '{ print tolower($3) }'` = "little" ]; then - snapcraftctl build + craftctl default fi prime: - - usr/lib/$SNAPCRAFT_ARCH_TRIPLET/libMAC.so* + - usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libMAC.so* libmp3lame: after: [ patches ] @@ -119,12 +123,12 @@ parts: plugin: autotools autotools-configure-parameters: [ --prefix=/usr, --enable-nasm, --disable-frontend ] build-environment: - - CFLAGS: "$CFLAGS -O3 -funroll-loops" + - CFLAGS: "${CFLAGS-} -O3 -funroll-loops" override-build: | - if [ "$SNAP_ARCH" = "amd64" ]; then - patch -p0 < $SNAPCRAFT_STAGE/lame-3.100-sse-20171014.patch + if [ "$CRAFT_ARCH_BUILD_FOR" = "amd64" ]; then + patch -p0 < $CRAFT_STAGE/lame-3.100-sse-20171014.patch fi - snapcraftctl build + craftctl default prime: - usr/lib/libmp3lame.so* @@ -134,7 +138,7 @@ parts: plugin: autotools autotools-configure-parameters: [ --prefix=/usr ] build-environment: - - CXXFLAGS: "$CXXFLAGS -Os" + - CXXFLAGS: "${CXXFLAGS-} -Os" prime: - usr/lib/libmp4v2.so* @@ -143,20 +147,20 @@ parts: source-checksum: sha256/3c8919243707951cac0e3c39bbf28653bcaffc43c98ff16801a27350db8f0f21 plugin: make build-environment: - - CFLAGS: "$CFLAGS -O3 -funroll-loops" + - CFLAGS: "${CFLAGS-} -O3 -funroll-loops" override-build: | - if [ "$SNAP_ARCH" = "i386" ]; then + if [ "$CRAFT_ARCH_BUILD_FOR" = "i386" ]; then ./configure --prefix=/usr --with-cpu=sse - elif [ "$SNAP_ARCH" = "amd64" ]; then + elif [ "$CRAFT_ARCH_BUILD_FOR" = "amd64" ]; then ./configure --prefix=/usr --with-cpu=x86-64 - elif [ "$SNAP_ARCH" = "armhf" ]; then + elif [ "$CRAFT_ARCH_BUILD_FOR" = "armhf" ]; then ./configure --prefix=/usr --with-cpu=neon - elif [ "$SNAP_ARCH" = "arm64" ]; then + elif [ "$CRAFT_ARCH_BUILD_FOR" = "arm64" ]; then ./configure --prefix=/usr --with-cpu=neon64 else ./configure --prefix=/usr fi - snapcraftctl build + craftctl default prime: - usr/lib/libmpg123.so* @@ -167,7 +171,7 @@ parts: plugin: autotools autotools-configure-parameters: [ --prefix=/usr ] build-environment: - - CFLAGS: "$CFLAGS -O3 -funroll-loops" + - CFLAGS: "${CFLAGS-} -O3 -funroll-loops" prime: - usr/lib/libogg.so* @@ -176,14 +180,14 @@ parts: source-checksum: sha256/65c1d2f78b9f2fb20082c38cbe47c951ad5839345876e46941612ee87f9a7ce1 plugin: make build-environment: - - CFLAGS: "$CFLAGS -O3 -funroll-loops" + - CFLAGS: "${CFLAGS-} -O3 -funroll-loops" override-build: | - if [ "$SNAP_ARCH" = "armhf" ]; then + if [ "$CRAFT_ARCH_BUILD_FOR" = "armhf" ]; then ./configure --prefix=/usr --enable-float-approx --enable-osce --disable-intrinsics --disable-rtcd else ./configure --prefix=/usr --enable-float-approx --enable-osce fi - snapcraftctl build + craftctl default prime: - usr/lib/libopus.so* @@ -193,10 +197,10 @@ parts: plugin: autotools autotools-configure-parameters: [ --prefix=/usr ] build-environment: - - CFLAGS: "$CFLAGS -O3 -funroll-loops" + - CFLAGS: "${CFLAGS-} -O3 -funroll-loops" override-build: | autoreconf -i - snapcraftctl build + craftctl default prime: - usr/lib/librnnoise.so* @@ -206,7 +210,7 @@ parts: plugin: autotools autotools-configure-parameters: [ --prefix=/usr ] build-environment: - - CFLAGS: "$CFLAGS -O3 -funroll-loops" + - CFLAGS: "${CFLAGS-} -O3 -funroll-loops" prime: - usr/lib/libspeex.so* @@ -217,13 +221,13 @@ parts: plugin: autotools autotools-configure-parameters: [ --prefix=/usr ] build-environment: - - CFLAGS: "$CFLAGS -O3" + - CFLAGS: "${CFLAGS-} -O3" override-build: | - patch -p1 < $SNAPCRAFT_STAGE/libvorbis-1.3.7-aotuv-b6.03.patch - if [ "$SNAP_ARCH" = "amd64" ]; then - patch -p1 < $SNAPCRAFT_STAGE/libvorbis-1.3.7-aotuv-b6.03-lancer.patch + patch -p1 < $CRAFT_STAGE/libvorbis-1.3.7-aotuv-b6.03.patch + if [ "$CRAFT_ARCH_BUILD_FOR" = "amd64" ]; then + patch -p1 < $CRAFT_STAGE/libvorbis-1.3.7-aotuv-b6.03-lancer.patch fi - snapcraftctl build + craftctl default prime: - usr/lib/libvorbis*.so* @@ -243,10 +247,10 @@ parts: - gnome-icon-theme override-prime: | mkdir -p share/icons/gnome/32x32/status - cp $SNAPCRAFT_STAGE/usr/share/icons/gnome/32x32/status/dialog-error.png share/icons/gnome/32x32/status - cp $SNAPCRAFT_STAGE/usr/share/icons/gnome/32x32/status/dialog-information.png share/icons/gnome/32x32/status - cp $SNAPCRAFT_STAGE/usr/share/icons/gnome/32x32/status/dialog-question.png share/icons/gnome/32x32/status - cp $SNAPCRAFT_STAGE/usr/share/icons/gnome/32x32/status/dialog-warning.png share/icons/gnome/32x32/status + cp $CRAFT_STAGE/usr/share/icons/gnome/32x32/status/dialog-error.png share/icons/gnome/32x32/status + cp $CRAFT_STAGE/usr/share/icons/gnome/32x32/status/dialog-information.png share/icons/gnome/32x32/status + cp $CRAFT_STAGE/usr/share/icons/gnome/32x32/status/dialog-question.png share/icons/gnome/32x32/status + cp $CRAFT_STAGE/usr/share/icons/gnome/32x32/status/dialog-warning.png share/icons/gnome/32x32/status smooth: after: [ patches ] @@ -254,7 +258,7 @@ parts: plugin: make make-parameters: [ prefix= ] build-environment: - - CXXFLAGS: "$CXXFLAGS -g0 -Os -fno-rtti -fno-exceptions" + - CXXFLAGS: "${CXXFLAGS-} -g0 -Os -fno-rtti -fno-exceptions" build-packages: - libbz2-dev - libcurl4-gnutls-dev @@ -262,7 +266,7 @@ parts: - libjpeg8-dev - libxml2-dev stage-packages: - - libcurl3-gnutls + - libcurl3t64-gnutls - libfribidi0 boca: @@ -271,10 +275,10 @@ parts: plugin: make make-parameters: [ prefix= ] build-environment: - - CXXFLAGS: "$CXXFLAGS -g0 -Os -fno-rtti -fno-exceptions" + - CXXFLAGS: "${CXXFLAGS-} -g0 -Os -fno-rtti -fno-exceptions" override-build: | - patch -p1 < $SNAPCRAFT_STAGE/boca-1.1.8-pre-snap.patch - snapcraftctl build + patch -p1 < $CRAFT_STAGE/boca-1.1.8-pre-snap.patch + craftctl default build-packages: - libexpat1-dev - libpulse-dev @@ -291,13 +295,13 @@ parts: plugin: make make-parameters: [ prefix= ] build-environment: - - CXXFLAGS: "$CXXFLAGS -g0 -Os -fno-rtti -fno-exceptions -DFREAC_DATE=\\\\\\\"`date +\"%Y%m%d\"`\\\\\\\"" + - CXXFLAGS: "${CXXFLAGS-} -g0 -Os -fno-rtti -fno-exceptions -DFREAC_DATE=\\\\\\\"`date +\"%Y%m%d\"`\\\\\\\"" override-pull: | - snapcraftctl pull - snapcraftctl set-version "$(echo 1.1.7~`date +"%Y%m%d"`)" + craftctl default + craftctl set version=$(echo 1.1.7~`date +"%Y%m%d"`) 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 override-build: | - patch -p1 < $SNAPCRAFT_STAGE/freac-1.1.6-pre-snap.patch - snapcraftctl build + patch -p1 < $CRAFT_STAGE/freac-1.1.6-pre-snap.patch + craftctl default build-packages: - libudev-dev