Try to use compiled SDL2 in linux arm64 nightly.

This commit is contained in:
Martín Lucas Golini
2024-10-03 00:06:59 -03:00
parent 2e4199aa28
commit d4187fcdab
4 changed files with 8 additions and 11 deletions

View File

@@ -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/

View File

@@ -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

View File

@@ -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

View File

@@ -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