Click here to go back to the commit logs for prismlauncher-git.

Commit:

---

Hash: 7a4cd9908b0b3624bc1be5a7b9d01f353e1ab64f

Message: properly support ARM Signed-off-by: lordpipe <lordpipe@protonmail.com>

Diff

---

diff --git a/.SRCINFO b/.SRCINFO
index 7f503be..c576364 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -3,10 +3,12 @@ pkgname = prismlauncher-git
 pkgbase = prismlauncher-git
 pkgdesc = Minecraft launcher with ability to manage multiple instances.
 pkgrel = 1
-pkgver = 8.0.r1.f1ebec6
+pkgver = 8.0.r1.bcadffa
 url = https://github.com/PrismLauncher/PrismLauncher
 arch = i686
 arch = amd64
+arch = arm64
+arch = armhf
 conflicts = prismlauncher
 depends = libqt5svg5
 depends = qt5-image-formats-plugins
diff --git a/PKGBUILD b/PKGBUILD
index 2395161..1a81e82 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,12 +1,13 @@
-# Maintainer: dada513 <dada513@protonmail.com>
-# Contributor: Sefa Eyeoglu <conctact@scrumplex.net>
+# Maintainer: Sefa Eyeoglu <conctact@scrumplex.net>
+# Contributor: dada513 <dada513@protonmail.com>
+# Contributor: lordpipe <lordpipe@protonmail.com>
 
 _pkgname=prismlauncher
 pkgname=${_pkgname}-git
-pkgver=8.0.r1.f1ebec6
+pkgver=8.0.r1.bcadffa
 pkgrel=1
 pkgdesc="Minecraft launcher with ability to manage multiple instances."
-arch=('i686' 'amd64')
+arch=('i686' 'amd64' 'arm64' 'armhf')
 url="https://github.com/PrismLauncher/PrismLauncher"
 license=('GPL3')
 depends=('libqt5svg5' 'qt5-image-formats-plugins' 'libqt5xml5' 'libqt5core5a' 'libqt5network5' 'libqt5gui5')
@@ -19,6 +20,38 @@ source=("git+https://github.com/PrismLauncher/PrismLauncher.git")
 
 sha256sums=('SKIP')
 
+# allow for ARM support
+#TODO: makedeb's hard-coding for x86-64 has been fixed in a future makedeb version
+#TODO: these 6 lines make this script match the behavior of future makedeb. When it releases, remove this
+CARCH="$(uname -p)"
+CHOST="$(uname -p)-pc-linux-gnu"
+CFLAGS=${CFLAGS/-march=x86-64/}
+CXXFLAGS=${CXXFLAGS/-march=x86-64/}
+CFLAGS=${CFLAGS/-mtune=generic/}
+CXXFLAGS=${CXXFLAGS/-mtune=generic/}
+
+# if the user hasn't specified a tuning/architecture, specify our own minimal defaults to cover the earliest CPUs
+if [[ ${CFLAGS} != *"-mtune"* && ${CFLAGS} != *"-march"* ]]; then
+  case $(uname -m) in
+    x86_64)
+      CFLAGS+=" -march=x86-64 -mtune=generic"
+      CXXFLAGS+=" -march=x86-64 -mtune=generic"
+      ;;
+    aarch64*|armv8*|armv9*|arm64*)
+      CFLAGS+=" -march=armv8-a -mtune=generic"
+      CXXFLAGS+=" -march=armv8-a -mtune=generic"
+      ;;
+    arm*)
+      CFLAGS+=" -march=armv7-a -mtune=generic"
+      CXXFLAGS+=" -march=armv7-a -mtune=generic"
+      ;;
+    *)
+      CFLAGS+=" -mtune=generic"
+      CXXFLAGS+=" -mtune=generic"
+      ;;
+  esac
+fi
+
 pkgver() {
   cd "PrismLauncher"
   printf "%s.%s.r%s.%s" "$(grep -m 1 -oP 'Launcher_VERSION_MAJOR +\K\d+' CMakeLists.txt)" \