Fix alternate architectures

2 files changed, 32 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 443c133612b6..8ff59172a039 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -3,26 +3,25 @@ pkgbase = pico-8
 	pkgver = 0.2.5c
 	pkgrel = 2
 	url = http://www.lexaloffle.com/pico-8.php
-	arch = i686
 	arch = x86_64
-	arch = armv6h
+	arch = i686
 	arch = armv7h
+	arch = aarch64
 	license = custom:commercial
 	depends = glibc
 	depends = sdl2
 	optdepends = wget: BBS download support
-	replaces = pico8-bin
+	provides = pico8
 	source = pico-8.desktop
 	source = pico-8.xml
 	sha256sums = 272f33c38a74456a4d2597a6b1d0c6ee9695d0e47f31ce08018c24a78e62759e
 	sha256sums = 2776340602e7ad29898500c4b2162bb5dd7746b933fb443b551e25a751e375e7
-	source_i686 = file://pico-8_0.2.5c_i386.zip
-	sha256sums_i686 = 3ddc7ae2fc67352cabda1935114403cc70f408f73d25faee5385d85faa071f2f
 	source_x86_64 = file://pico-8_0.2.5c_amd64.zip
 	sha256sums_x86_64 = a433059942d5a4275d879c718a7d7d1611068d65f9cf57782ffefb11d7e2c8db
-	source_armv6h = file://pico-8_0.2.5c_raspi.zip
-	sha256sums_armv6h = 56a1239373f1681104a76ca24a1b3534079707ed787cde5d948ed71c651ba59e
+	source_i686 = file://pico-8_0.2.5c_i386.zip
+	sha256sums_i686 = 3ddc7ae2fc67352cabda1935114403cc70f408f73d25faee5385d85faa071f2f
 	source_armv7h = file://pico-8_0.2.5c_raspi.zip
 	sha256sums_armv7h = 56a1239373f1681104a76ca24a1b3534079707ed787cde5d948ed71c651ba59e
+	source_aarch64 = file://pico-8_0.2.5c_raspi.zip
 
 pkgname = pico-8
diff --git a/PKGBUILD b/PKGBUILD
index d14ba87d4eb8..58ce6ee75fda 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,22 +5,19 @@ pkgname='pico-8'
 pkgver='0.2.5c'
 pkgrel=2
 pkgdesc="A fantasy console for making, sharing and playing tiny games and other computer programs."
-arch=('i686' 'x86_64' 'armv6h' 'armv7h')
+arch=('x86_64' 'i686' 'armv7h' 'aarch64')
 url="http://www.lexaloffle.com/pico-8.php"
 license=('custom:commercial')
 depends=('glibc' 'sdl2')
 optdepends=('wget: BBS download support')
-replaces=('pico8-bin')
-
-
-_file_zip_arm="${pkgname}_${pkgver}_raspi.zip"
+provides=('pico8')
 
 source=("${pkgname}.desktop"
         "${pkgname}.xml")
 source_i686=("file://${pkgname}_${pkgver}_i386.zip")
 source_x86_64=("file://${pkgname}_${pkgver}_amd64.zip")
-source_armv6h=("file://${_file_zip_arm}")
-source_armv7h=("file://${_file_zip_arm}")
+source_armv7h=("file://${pkgname}_${pkgver}_raspi.zip")
+source_aarch64=("file://${pkgname}_${pkgver}_raspi.zip")
 
 sha256sums=('272f33c38a74456a4d2597a6b1d0c6ee9695d0e47f31ce08018c24a78e62759e'
             '2776340602e7ad29898500c4b2162bb5dd7746b933fb443b551e25a751e375e7')
@@ -32,12 +29,7 @@ sha256sums_armv7h=('56a1239373f1681104a76ca24a1b3534079707ed787cde5d948ed71c651b
 
 prepare () {
   # Moves content of the subfolder named pico-8 to src root
-  if [ $CARCH = "i686" ]; then 
-    mv "./pico-8_i386/"* .
-  else
-    mv "./pico-8/"* .
-  fi
-
+  mv pico-8/* .
   # Changes license and icon filenames to comply with naming conventions
   mv "license.txt" "LICENSE"
   mv "lexaloffle-pico8.png" "${pkgname}.png"
@@ -49,16 +41,29 @@ package () {
   local _opt="${pkgdir}/opt/${pkgname}"
   local _share="${pkgdir}/usr/share"
 
-  # Installs the extracted files
-  install -Dm644 "LICENSE" "${_share}/licenses/${pkgname}/LICENSE"
-  install -Dm755 "${_name}" "${_opt}/${_name}"
-  install -Dm644 -t "${_opt}" "${_name}.dat" "${pkgname}_manual.txt" "readme_linux.txt"
-  if [ $CARCH != x86_64 ]; then
-    install -Dm644 "${_name}_dyn" "${_target}/${_name}_dyn"
-  fi
-  install -Dm644 "${pkgname}.xml" "${_share}/mime/packages/${pkgname}.xml"
+  # Desktop entry
   install -Dm644 "${pkgname}.desktop" "${_share}/applications/${pkgname}.desktop"
   install -Dm644 "${pkgname}.png" "${_share}/pixmaps/${pkgname}.png"
+  install -Dm644 "${pkgname}.xml" "${_share}/mime/packages/${pkgname}.xml"
+  # License
+  install -Dm644 "LICENSE" "${_share}/licenses/${pkgname}/LICENSE"
+  # Data and readmes
+  install -Dm644 -t "${_opt}" "${_name}.dat" "${pkgname}_manual.txt" readme_*.txt
+
+  # Binary
+  local _target
+  case $CARCH in
+    "x86_64" | "armv7h")
+      _target="${_name}_dyn"
+      ;;
+    "i686")
+      _target="${_name}_32bit_dyn"
+      ;;
+    "aarch64")
+      _target="${_name}_64"
+      ;;
+  esac
+  install -Dm755 "${_target}" "${_opt}/${_name}"
 
   # Links the installed binary to /usr/bin
   local _bin="${pkgdir}/usr/bin"