From 8b75d75a92681d1ec41d5666da6b85ea0609cb7d Mon Sep 17 00:00:00 2001 From: Jaylon Gowie Date: Fri, 7 Jan 2022 23:15:56 -0600 Subject: [PATCH 1/4] Add ARM64 download link --- include/install-vitasdk.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/include/install-vitasdk.sh b/include/install-vitasdk.sh index d0f4a6f..e914d94 100755 --- a/include/install-vitasdk.sh +++ b/include/install-vitasdk.sh @@ -4,6 +4,10 @@ get_download_link () { wget -qO- https://github.com/vitasdk/vita-headers/raw/master/.travis.d/last_built_toolchain.py | python - $@ } +get_download_link_arm () { + curl -s https://api.github.com/repos/SonicMastr/autobuilds/releases/latest | awk -F\" '/browser_download_url.*.tar.bz2/{print $(NF-1)}' +} + install_vitasdk () { INSTALLDIR=$1 @@ -22,7 +26,11 @@ install_vitasdk () { sudo mkdir -p $INSTALLDIR sudo chown $USER:$(id -gn $USER) $INSTALLDIR fi - wget -O- "$(get_download_link master linux)" | tar xj -C $INSTALLDIR --strip-components=1 + if ! [[ "$(uname -m)" =~ ^(armv7l|arm64|aarch64)$ ]]; then + wget -O- "$(get_download_link master linux)" | tar xj -C $INSTALLDIR --strip-components=1 + else + wget -O- "$(get_download_link_arm)" | tar xj -C $INSTALLDIR --strip-components=1 + fi ;; MSYS*|MINGW64*) From 4b9b2bf7e5f4f31a5ce1b647697157560e0981a1 Mon Sep 17 00:00:00 2001 From: Jaylon Gowie Date: Thu, 11 Nov 2021 19:17:42 -0600 Subject: [PATCH 2/4] Add TinyXML2 --- include/install-packages.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/include/install-packages.sh b/include/install-packages.sh index e903535..e4a9b71 100755 --- a/include/install-packages.sh +++ b/include/install-packages.sh @@ -84,6 +84,7 @@ PACKAGES=( ffmpeg physfs vita-libdl + tinyxml2 cpython pib ) From a93b39b7b836d495f6051570925080a0606175d5 Mon Sep 17 00:00:00 2001 From: Sebastian Krzyszkowiak Date: Mon, 26 Jul 2021 02:01:03 +0200 Subject: [PATCH 3/4] Add missing libtheora to install-packages.sh --- include/install-packages.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/include/install-packages.sh b/include/install-packages.sh index e4a9b71..902a61a 100755 --- a/include/install-packages.sh +++ b/include/install-packages.sh @@ -22,6 +22,7 @@ PACKAGES=( libogg libvorbis flac + libtheora libtremor libmikmod libftpvita From d152fe730ce8426ca0044f96dddc74a981f50103 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Thu, 5 Jan 2023 15:25:10 -0600 Subject: [PATCH 4/4] Single `get_download_link` function/Add unsupported architecture error --- include/install-vitasdk.sh | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/include/install-vitasdk.sh b/include/install-vitasdk.sh index e914d94..9684114 100755 --- a/include/install-vitasdk.sh +++ b/include/install-vitasdk.sh @@ -1,11 +1,14 @@ #!/bin/bash get_download_link () { - wget -qO- https://github.com/vitasdk/vita-headers/raw/master/.travis.d/last_built_toolchain.py | python - $@ -} - -get_download_link_arm () { - curl -s https://api.github.com/repos/SonicMastr/autobuilds/releases/latest | awk -F\" '/browser_download_url.*.tar.bz2/{print $(NF-1)}' + if ! [[ "$(uname -m)" =~ ^(armv7l|arm64|aarch64)$ ]]; then + wget -qO- https://github.com/vitasdk/vita-headers/raw/master/.travis.d/last_built_toolchain.py | python - $@ + elif [[ "$(uname -s)" == Linux* ]]; then + curl -s https://api.github.com/repos/SonicMastr/autobuilds/releases/latest | awk -F\" '/browser_download_url.*.tar.bz2/{print $(NF-1)}' + else + echo "Unsupported Architecture. VitaSDK not installed" + exit 1 + fi } install_vitasdk () { @@ -26,11 +29,7 @@ install_vitasdk () { sudo mkdir -p $INSTALLDIR sudo chown $USER:$(id -gn $USER) $INSTALLDIR fi - if ! [[ "$(uname -m)" =~ ^(armv7l|arm64|aarch64)$ ]]; then - wget -O- "$(get_download_link master linux)" | tar xj -C $INSTALLDIR --strip-components=1 - else - wget -O- "$(get_download_link_arm)" | tar xj -C $INSTALLDIR --strip-components=1 - fi + wget -O- "$(get_download_link master linux)" | tar xj -C $INSTALLDIR --strip-components=1 ;; MSYS*|MINGW64*)