ARM64: AppImage build support

diff --git a/BUILDING.md b/BUILDING.md
index a8f867245c55e191a5d67d08b962028e80de4696..87fb534e9a18a3405fddf76389e9b44ec7e29595 100644 (file)
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -94,6 +94,26 @@ docker run --platform linux/arm64/v8 --rm -it -v $PWD:/feather -w /feather feath
 
 The resulting binary can be found in `./build/bin/`.
 
+##### AppImage
+
+##### ARMv8-a (with AES hardware acceleration)
+
+```bash
+rm -rf build
+docker run --rm -it -v $PWD:/feather --platform linux/arm64/v8 -w /feather feather:linux-arm64 sh -c 'make release-static-linux-arm64 -j8'
+docker run --rm -it -v $PWD:/feather --platform linux/arm64/v8 -w /feather/build feather:linux-arm64 ../contrib/build-appimage-arm64.sh
+```
+
+##### Raspberry Pi
+
+```bash
+rm -rf build
+docker run --rm -it -v $PWD:/feather --platform linux/arm64/v8 -w /feather feather:linux-arm64 sh -c 'make release-static-linux-arm64-rpi -j8'
+docker run --rm -it -v $PWD:/feather --platform linux/arm64/v8 -w /feather/build feather:linux-arm64 ../contrib/build-appimage-arm64.sh
+```
+
+The resulting AppImage will be located in `./build`.
+
 ### Windows (reproducible)
 
 #### 1. Clone

diff --git a/Dockerfile.linux b/Dockerfile.linux
index 5e6728c07a2c87da60ad1e8f9b617f4aacb28240..9fbb7a467002469836050beeb29fd74391859186 100644 (file)
--- a/Dockerfile.linux
+++ b/Dockerfile.linux
@@ -89,15 +89,14 @@ RUN git clone git://code.qt.io/qt/qt5.git -b ${QT_VERSION} --depth 1 && \
     sed -ri s/\(Libs:.*\)/\\1\ -lz/ /usr/local/lib/pkgconfig/freetype2.pc && \
     sed -i s/\\/usr\\/X11R6\\/lib64/\\/usr\\/local\\/lib/ qtbase/mkspecs/linux-g++-64/qmake.conf
 
-RUN if [ "$(uname -m)" = "aarch64" ]; then \
+RUN cd qt5 && \
+    if [ "$(uname -m)" = "aarch64" ]; then \
         export LIBDIR="/usr/lib/aarch64-linux-gnu"; \
         export QT_PLATFORM="linux-aarch64-gnu-g++"; \
     else \
         export LIBDIR="/usr/lib/x86_64-linux-gnu"; \
         export QT_PLATFORM="linux-g++-64"; \
-    fi
-
-RUN cd qt5 && \
+    fi && \
     rm $LIBDIR/libX11.a && \
     rm $LIBDIR/libX11-xcb.a && \
     OPENSSL_LIBS="-lssl -lcrypto -lpthread -ldl" \

diff --git a/contrib/build-appimage-arm64.sh b/contrib/build-appimage-arm64.sh
new file mode 100755 (executable)
index 0000000..e30eeaa
--- /dev/null
+++ b/contrib/build-appimage-arm64.sh
@@ -0,0 +1,79 @@
+#!/bin/bash
+
+# TODO: Merge with build-appimage.sh
+
+set -e
+unset SOURCE_DATE_EPOCH
+
+# Temporary workaround for linuxdeployqt issue on arm64
+if [ "$(uname -m)" = "aarch64" ]; then
+  pushd /
+  apt update
+  apt install -y qt5-default
+  git clone https://github.com/probonopd/linuxdeployqt.git
+  cd linuxdeployqt
+  git reset --hard b4697483c98120007019c3456914cfd1dba58384
+  qmake
+  make -j$THREADS
+  make install
+  rm -rf $(pwd)
+  popd
+fi
+
+APPDIR="$PWD/feather.AppDir"
+rm -rf $APPDIR
+mkdir -p "$APPDIR"
+mkdir -p "$APPDIR/usr/share/applications/"
+mkdir -p "$APPDIR/usr/bin"
+mkdir -p "$APPDIR/usr/lib"
+mkdir -p "$APPDIR/usr/plugins"
+
+cp "$PWD/../src/assets/feather.desktop" "$APPDIR/usr/share/applications/feather.desktop"
+cp "$PWD/../src/assets/images/appicons/64x64.png" "$APPDIR/feather.png"
+cp "$PWD/release/bin/feather" "$APPDIR/usr/bin/feather"
+chmod +x "$APPDIR/usr/bin/feather"
+
+export LD_LIBRARY_PATH=/usr/lib/aarch64-linux-gnu/:/usr/local/lib/$LD_LIBRARY_PATH
+linuxdeployqt feather.AppDir/usr/share/applications/feather.desktop -verbose=2 -bundle-non-qt-libs
+
+pushd feather.AppDir/usr/plugins
+ln -s ../lib/ gstreamer
+popd
+
+GST_PLUGINS=("libgstcamerabin.so libgstcoreelements.so libgstvolume.so libgstapp.so libgstvideoconvert.so
+              libgstvideoscale.so libgstvideo4linux2.so libgstencoding.so libgstmultifile.so libgstmatroska.so
+              libgstvpx.so libgstjpegformat.so libgstjpeg.so libgstautodetect.so libgstaudiotestsrc.so
+              libgstvorbis.so libgstaudiorate.so libgstaudioconvert.so libgstaudioresample.so libgstvideocrop.so")
+
+for plugin in ${GST_PLUGINS[*]}; do
+  cp /usr/lib/aarch64-linux-gnu/gstreamer-1.0/$plugin feather.AppDir/usr/plugins/gstreamer/
+
+  # linuxdeployqt doesn't set RUNPATH on libs that are only loaded at runtime
+  patchelf --set-rpath "\$ORIGIN" feather.AppDir/usr/plugins/gstreamer/$plugin
+done
+
+cp /usr/lib/aarch64-linux-gnu/gstreamer1.0/gstreamer-1.0/gst-plugin-scanner feather.AppDir/usr/plugins/gstreamer/
+
+# Need second deploy for gstreamer dependencies
+linuxdeployqt feather.AppDir/usr/share/applications/feather.desktop -verbose=2 -bundle-non-qt-libs
+
+rm "$APPDIR/AppRun"
+cp "$PWD/../contrib/AppImage/AppRun" "$APPDIR/"
+chmod +x "$APPDIR/AppRun"
+
+find feather.AppDir/ -exec touch -h -a -m -t 202101010100.00 {} \;
+
+# Manually create AppImage (reproducibly)
+
+# download runtime
+wget -nc https://github.com/AppImage/AppImageKit/releases/download/13/runtime-aarch64
+echo "d2624ce8cc2c64ef76ba986166ad67f07110cdbf85112ace4f91611bc634c96a runtime-aarch64" | sha256sum -c
+
+mksquashfs feather.AppDir feather.squashfs -info -root-owned -no-xattrs -noappend -fstime 0
+# mksquashfs writes a timestamp to the header
+printf '\x00\x00\x00\x00' | dd conv=notrunc of=feather.squashfs bs=1 seek=$((0x8))
+
+rm -f feather.AppImage
+cat runtime-aarch64 >> feather.AppImage
+cat feather.squashfs >> feather.AppImage
+chmod a+x feather.AppImage