Merge pull request #2 from notimaginative/version_bump

bump versions and add arm64 support

.github/workflows/linux_build.yml

@@ -13,6 +13,9 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
@@ -30,12 +33,14 @@ jobs:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.CR_PAT }}
+
       - name: Build and push
         id: docker_build
         uses: docker/build-push-action@v4
         with:
           push: ${{ format('refs/heads/{0}', github.event.repository.default_branch) == github.ref }}
           context: './build/linux'
+          platforms: linux/amd64,linux/arm64
           file: './build/linux/Dockerfile'
           tags: ${{ steps.docker_meta.outputs.tags }}
           labels: ${{ steps.docker_meta.outputs.labels }}

build/linux/Dockerfile

@@ -1,4 +1,8 @@
-FROM docker.io/library/ubuntu:18.04
+FROM --platform=$TARGETPLATFORM docker.io/library/ubuntu:20.04
+
+ARG TARGETARCH
+
+ARG DEBIAN_FRONTEND=noninteractive
 
 ENV DEBIAN_FRONTEND=noninteractive
 
@@ -9,22 +13,22 @@ RUN add-apt-repository -y ppa:ubuntu-toolchain-r/test && add-apt-repository -y p
 
 # Repository for the Vulkan SDK so that we have the glslc compiler
 RUN wget -qO - https://packages.lunarg.com/lunarg-signing-key-pub.asc | apt-key add -
-RUN wget -qO /etc/apt/sources.list.d/lunarg-vulkan-1.3.224-bionic.list https://packages.lunarg.com/vulkan/1.3.224/lunarg-vulkan-1.3.224-bionic.list
+RUN wget -qO /etc/apt/sources.list.d/lunarg-vulkan-1.3.224-focal.list https://packages.lunarg.com/vulkan/1.3.224/lunarg-vulkan-1.3.224-focal.list
 
 RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | \
 	gpg --dearmor - | \
 	tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null && \
 	apt-add-repository "deb https://apt.kitware.com/ubuntu/ $(lsb_release -cs) main"
 
-RUN apt-get -yq update && apt-get -yq install cmake=3.25.2-0kitware1ubuntu18.04.1 \
+RUN apt-get -yq update && apt-get -yq install cmake=3.28.1-0kitware1ubuntu20.04.1 \
 	ninja-build libopenal-dev libreadline6-dev libpng-dev libjpeg62-dev \
-	liblua5.1-0-dev libjansson-dev libsdl2-dev libfreetype6-dev valgrind g++-5 g++-13 vulkan-sdk vulkan-headers vulkan-validationlayers libvulkan1 \
-	python3.8
+	liblua5.1-0-dev libjansson-dev libsdl2-dev libfreetype6-dev valgrind g++-9 g++-13 \
+	libvulkan-dev vulkan-validationlayers libvulkan1 python3.8 libxcb-glx0-dev
 
 COPY llvm.sh /tmp/llvm.sh
 RUN /tmp/llvm.sh 16 && apt-get -yq install clang-tidy-16 libc++-16-dev libc++abi-16-dev
 
-COPY ./ccache-4.8.2-linux-x86_64/ /tmp/ccache/
+COPY ./ccache-4.8.2-linux-${TARGETARCH}/ /tmp/ccache/
 RUN cd /tmp/ccache && make install
 
 # aqt needs at least python 3.7 so we install something that is "good enough" for that. Ubuntu 18.04 does not have a lot of support anymore unfortunately
@@ -37,7 +41,7 @@ RUN update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.8 1
 
 RUN rm -rf /tmp/*
 
-COPY appimagetool /tools/appimagetool
+COPY ./appimagetool-${TARGETARCH}/ /tools/appimagetool/
 
 RUN ln -s /tools/appimagetool/AppRun /usr/bin/appimagetool
 

build/linux/appimagetool-arm64/AppRun

@@ -0,0 +1,12 @@
+#!/bin/sh
+SELF=$(readlink -f "$0")
+HERE=${SELF%/*}
+export PATH="${HERE}/usr/bin/:${HERE}/usr/sbin/:${HERE}/usr/games/:${HERE}/bin/:${HERE}/sbin/${PATH:+:$PATH}"
+export LD_LIBRARY_PATH="${HERE}/usr/lib/:${HERE}/usr/lib/i386-linux-gnu/:${HERE}/usr/lib/x86_64-linux-gnu/:${HERE}/usr/lib32/:${HERE}/usr/lib64/:${HERE}/lib/:${HERE}/lib/i386-linux-gnu/:${HERE}/lib/x86_64-linux-gnu/:${HERE}/lib32/:${HERE}/lib64/${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
+export PYTHONPATH="${HERE}/usr/share/pyshared/${PYTHONPATH:+:$PYTHONPATH}"
+export XDG_DATA_DIRS="${HERE}/usr/share/${XDG_DATA_DIRS:+:$XDG_DATA_DIRS}"
+export PERLLIB="${HERE}/usr/share/perl5/:${HERE}/usr/lib/perl5/${PERLLIB:+:$PERLLIB}"
+export GSETTINGS_SCHEMA_DIR="${HERE}/usr/share/glib-2.0/schemas/${GSETTINGS_SCHEMA_DIR:+:$GSETTINGS_SCHEMA_DIR}"
+export QT_PLUGIN_PATH="${HERE}/usr/lib/qt4/plugins/:${HERE}/usr/lib/i386-linux-gnu/qt4/plugins/:${HERE}/usr/lib/x86_64-linux-gnu/qt4/plugins/:${HERE}/usr/lib32/qt4/plugins/:${HERE}/usr/lib64/qt4/plugins/:${HERE}/usr/lib/qt5/plugins/:${HERE}/usr/lib/i386-linux-gnu/qt5/plugins/:${HERE}/usr/lib/x86_64-linux-gnu/qt5/plugins/:${HERE}/usr/lib32/qt5/plugins/:${HERE}/usr/lib64/qt5/plugins/${QT_PLUGIN_PATH:+:$QT_PLUGIN_PATH}"
+EXEC=$(grep -e '^Exec=.*' "${HERE}"/*.desktop | head -n 1 | cut -d "=" -f 2 | cut -d " " -f 1)
+exec "${EXEC}" "$@"

build/linux/appimagetool-arm64/appimagetool.desktop

@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Name=appimagetool
+Exec=appimagetool
+Comment=Tool to generate AppImages from AppDirs
+Icon=appimagetool
+Categories=Development;
+Terminal=true
+

build/linux/appimagetool-arm64/usr/share/applications/appimagetool.desktop

@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Name=appimagetool
+Exec=appimagetool
+Comment=Tool to generate AppImages from AppDirs
+Icon=appimagetool
+Categories=Development;
+Terminal=true
+

build/linux/appimagetool-arm64/usr/share/metainfo/appimagetool.appdata.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop">
+  <id>appimagetool.desktop</id>
+  <metadata_license>MIT</metadata_license>
+  <project_license>MIT</project_license>
+  <name>appimagetool</name>
+  <summary>Create AppImage files</summary>
+  <description>
+    <p>
+      appimagetool is a tool that lets you generate AppImage files. An AppImage
+      is a self-running bundle that contains an application and everything
+      it needs to run that cannot reasonably expected to be part of each target system.
+    </p>
+    <p>
+      This can include libraries that are not commonly available on target systems,
+      resources such as translations, icons, fonts, and other auxiliary files.
+      appimagetool makes it easy to take an AppDir (e.g., generated by linuxdeployqt)
+      and turn it into an AppImage.
+    </p>
+    <p>
+      You can also embed update information so that your users can update the AppImage
+      using binary delta updates with the AppImageUpdate tool.
+      You can also sign the AppImage with GPG.
+    </p>
+  </description>
+  <url type="homepage">https://github.com/AppImage/AppImageKit</url>
+  <project_group>AppImage</project_group>
+  <provides>
+    <binary>appimagetool</binary>
+  </provides>
+</component>