From d4187fcdab28575e91058604af3f63c0cc16ac48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Lucas=20Golini?= <spartanj@gmail.com>
Date: Thu, 3 Oct 2024 00:06:59 -0300
Subject: [PATCH] Try to use compiled SDL2 in linux arm64 nightly.

---
 .github/workflows/ecode-nightly.yml             |  1 -
 projects/linux/ecode/build.app.sh               |  3 ---
 projects/linux/scripts/find_most_recent_sdl2.sh | 13 +++++++------
 projects/linux/scripts/install_sdl2.sh          |  2 +-
 4 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ecode-nightly.yml b/.github/workflows/ecode-nightly.yml
index a0e2cf183..bd7e053d8 100644
--- a/.github/workflows/ecode-nightly.yml
+++ b/.github/workflows/ecode-nightly.yml
@@ -124,7 +124,6 @@ jobs:
           repos="main restricted universe multiverse"
           echo "deb [arch=arm64] $url $codename $repos" > arm64.list
           echo "deb [arch=arm64] $url $codename-backports $repos" >> arm64.list
-          echo "deb [arch=arm64] $url $codename-proposed $repos" >> arm64.list
           echo "deb [arch=arm64] $url $codename-security $repos" >> arm64.list
           echo "deb [arch=arm64] $url $codename-updates $repos" >> arm64.list
           sudo mv arm64.list /etc/apt/sources.list.d/
diff --git a/projects/linux/ecode/build.app.sh b/projects/linux/ecode/build.app.sh
index 97822835f..5f9f1792d 100755
--- a/projects/linux/ecode/build.app.sh
+++ b/projects/linux/ecode/build.app.sh
@@ -61,9 +61,6 @@ cp ecode.desktop ecode.app/
 cp ../../../bin/assets/icon/ecode.png ecode.app/ecode.png
 cp ../../../libs/linux/libeepp.so ecode.app/libs/
 cp ../../../bin/ecode ecode.app/ecode.bin
-
-bash ../scripts/find_most_recent_sdl2.sh --verbose
-
 cp -L "$(bash ../scripts/find_most_recent_sdl2.sh)" ecode.app/libs/ || exit
 ${STRIP:-strip} ecode.app/libs/libSDL2-2.0.so.0
 mkdir -p ecode.app/assets/colorschemes
diff --git a/projects/linux/scripts/find_most_recent_sdl2.sh b/projects/linux/scripts/find_most_recent_sdl2.sh
index a9b26e30d..a9beb421f 100644
--- a/projects/linux/scripts/find_most_recent_sdl2.sh
+++ b/projects/linux/scripts/find_most_recent_sdl2.sh
@@ -20,20 +20,21 @@ lib_paths=$(whereis libSDL2-2.0.so.0 | cut -d ':' -f 2)
 
 get_sdl_version() {
     local lib_path="$1"
-    local lib_dir=$(dirname "$lib_path")
+    local lib_dir
+    lib_dir=$(dirname "$lib_path")
 
     if [[ -f "$lib_dir/../bin/sdl2-config" ]]; then
-        local version=$("$lib_dir/../bin/sdl2-config" --version 2>/dev/null)
-        echo "$version"
+        "$lib_dir/../bin/sdl2-config" --version 2>/dev/null
     else
-        version=$(strings "$lib_path" | grep -Eo "SDL2-[0-9]+\.[0-9]+\.[0-9]+" | head -n 1 | cut -d '-' -f 2)
-        echo "$version"
+        strings "$lib_path" | grep -Eo "SDL2-[0-9]+\.[0-9]+\.[0-9]+" | head -n 1 | cut -d '-' -f 2
     fi
 }
 
 version_to_int() {
     local version="$1"
-    printf "%03d%03d%03d" $(echo "$version" | tr '.' ' ')
+    local major minor patch
+    IFS='.' read -r major minor patch <<< "$version"
+    echo $((major * 10000 + minor * 100 + patch))
 }
 
 latest_version_int=0
diff --git a/projects/linux/scripts/install_sdl2.sh b/projects/linux/scripts/install_sdl2.sh
index a8416e86a..e7089fb27 100644
--- a/projects/linux/scripts/install_sdl2.sh
+++ b/projects/linux/scripts/install_sdl2.sh
@@ -67,7 +67,7 @@ configure_for_aarch64() {
     export AR=aarch64-linux-gnu-ar
     export RANLIB=aarch64-linux-gnu-ranlib
     export STRIP=aarch64-linux-gnu-strip
-    ./configure --host=aarch64-linux-gnu --prefix=/usr --exec-prefix=/usr/local --enable-video-x11 --enable-video-wayland --enable-wayland-shared || exit
+    ./configure --host=aarch64-linux-gnu --prefix=/usr --enable-video-x11 --enable-video-wayland --enable-wayland-shared || exit
 }
 
 # Parse options