Click here to go back to the commit logs for fjordlauncher.

Commit:

---

Hash: 86c185c08418b97b035d077847a07dee917151c5

Message: update to prismlauncher 7.2, properly support ARM Signed-off-by: lordpipe <lordpipe@protonmail.com>

Diff

---

diff --git a/.SRCINFO b/.SRCINFO
index 57870bd..9c9e533 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -3,7 +3,7 @@ pkgname = prismlauncher
 pkgbase = prismlauncher
 pkgdesc = Minecraft launcher with ability to manage multiple instances.
 pkgrel = 1
-pkgver = 7.1
+pkgver = 7.2
 url = https://prismlauncher.org
 arch = i686
 arch = amd64
@@ -31,8 +31,8 @@ makedepends = gcc
 makedepends = g++
 optdepends = java-runtime=8: support for Minecraft versions < 1.17
 optdepends = java-runtime=17: support for Minecraft versions >= 1.17
-source = https://github.com/PrismLauncher/PrismLauncher/releases/download/7.1/PrismLauncher-7.1.tar.gz
-sha256sums = dc7aeff6e0dc12f4f2065e718418a4110ccdbad3e49fbd58e416a213fde7ebb1
+source = https://github.com/PrismLauncher/PrismLauncher/releases/download/7.2/PrismLauncher-7.2.tar.gz
+sha256sums = 5733b55c4532286813a6fb7de2f3a38e6f6db743a251919c8b646d32a84514b4
 makedepends = scdoc
 makedepends = extra-cmake-modules
 makedepends = cmake
diff --git a/PKGBUILD b/PKGBUILD
index 62aa6e6..d372cb7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,9 @@
-# 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
-pkgver=7.1
+pkgver=7.2
 pkgrel=1
 pkgdesc="Minecraft launcher with ability to manage multiple instances."
 arch=('i686' 'amd64' 'arm64' 'armhf')
@@ -11,9 +12,41 @@ license=('GPL3')
 depends=('libqt5svg5' 'qt5-image-formats-plugins' 'libqt5xml5' 'libqt5core5a' 'libqt5network5' 'libqt5gui5')
 makedepends=('scdoc' 'extra-cmake-modules' 'cmake' 'git' 'openjdk-17-jdk' 'zlib1g-dev' 'libgl1-mesa-dev' 'qtbase5-dev' 'qtchooser' 'qt5-qmake' 'qtbase5-dev-tools' 'gcc' 'g++')
 optdepends=('java-runtime=8: support for Minecraft versions < 1.17'
-            'java-runtime=17: support for Minecraft versions >= 1.17')	    
+            'java-runtime=17: support for Minecraft versions >= 1.17')
 source=("https://github.com/PrismLauncher/PrismLauncher/releases/download/$pkgver/PrismLauncher-$pkgver.tar.gz")
-sha256sums=('dc7aeff6e0dc12f4f2065e718418a4110ccdbad3e49fbd58e416a213fde7ebb1')
+sha256sums=('5733b55c4532286813a6fb7de2f3a38e6f6db743a251919c8b646d32a84514b4')
+
+# 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
 
 build() {
   cd "${srcdir}/PrismLauncher-$pkgver"
@@ -36,4 +69,3 @@ package() {
   cd "${srcdir}/PrismLauncher-$pkgver/build"
   DESTDIR="$pkgdir" cmake --install .
 }
-