Added package script and set "CROPPED" as the default aspect ratio

Author: DrUm78

Makefile

@@ -515,7 +515,7 @@ endif
 ifeq ($(TARGET_LINUX),1)
 
 ifeq ($(TARGET_FUNKEY),1)
-  OD_TOOLCHAIN ?= /opt/FunKey-sdk-2.0.0/
+  OD_TOOLCHAIN ?= /opt/FunKey-sdk/
   CC := $(OD_TOOLCHAIN)bin/arm-funkey-linux-musleabihf-gcc
   CXX := $(OD_TOOLCHAIN)bin/arm-funkey-linux-musleabihf-g++
   LD := $(OD_TOOLCHAIN)bin/arm-funkey-linux-musleabihf-gcc
@@ -622,8 +622,8 @@ else ifeq ($(ENABLE_SOFTRAST),1)
 	  GFX_CFLAGS  += $(shell /opt/rs90-toolchain/mipsel-rs90-linux-musl/sysroot/usr/bin/sdl-config --cflags)
 	  GFX_LDFLAGS += $(shell /opt/rs90-toolchain/mipsel-rs90-linux-musl/sysroot/usr/bin/sdl-config --libs) -flto -Wl,--as-needed -Wl,--gc-sections -Wl,-O1,--sort-common -s
 	else ifeq ($(TARGET_FUNKEY),1)
-	  GFX_CFLAGS  += $(shell /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/sdl-config --cflags)
-	  GFX_LDFLAGS += $(shell /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/sdl-config --libs) -Wl,--as-needed -Wl,--gc-sections -Wl,-O1,--sort-common -flto -s
+	  GFX_CFLAGS  += $(shell /opt/FunKey-sdk/arm-funkey-linux-musleabihf/sysroot/usr/bin/sdl-config --cflags)
+	  GFX_LDFLAGS += $(shell /opt/FunKey-sdk/arm-funkey-linux-musleabihf/sysroot/usr/bin/sdl-config --libs) -Wl,--as-needed -Wl,--gc-sections -Wl,-O1,--sort-common -flto -s
     GFX_LDFLAGS += -lSDL_ttf -lSDL_image
 	else ifeq ($(TARGET_BITTBOY),1)
 	  GFX_CFLAGS  += $(shell /opt/bittboy-toolchain/arm-buildroot-linux-musleabi/sysroot/usr/bin/sdl-config --cflags)

build_opk.sh

@@ -7,7 +7,7 @@ if [ $# -ne 1 ]; then
 	exit 1
 fi
 
-rm -f sm64-port-"$1".opk
-convert textures/segment2/segment2.05A00.rgba16.png -resize 32x32! build/icon.png
-#mksquashfs build/us_pc/sm64.us.f3dex2e ./run.sh build/icon.png default."$1".desktop sm64-port-"$1".opk 
-mksquashfs build/us_pc/sm64.us.f3dex2e build/icon.png default."$1".desktop sm64-port-"$1".opk 
+rm -f *.opk
+#convert textures/segment2/segment2.05A00.rgba16.png -resize 32x32! build/icon.png
+#mksquashfs build/us_pc/sm64.us.f3dex2e ./run.sh build/icon.png default."$1".desktop sm64-port-"$1".opk
+mksquashfs build/us_pc/sm64.us.f3dex2e opk/sm64.png opk/sm64."$1".desktop sm64_"$1".opk

default.funkey-s.desktop

@@ -0,0 +1,6 @@
+[Desktop Entry]
+Name=SM64
+Comment=Super Mario 64 port for the FunKey S
+Exec=sm64.us.f3dex2e
+Icon=sm64
+Categories=games

opk/sm64.funkey-s.desktop

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+rm -f *.opk
+git fetch --all
+git merge upstream/FunKey
+make distclean
+make -j16
+./build_opk.sh funkey-s

opk/sm64.png

@@ -1099,8 +1099,8 @@ static void gfx_sdl_swap_buffers_begin(void) {
       break;
 
       default:
-      printf("Wrong aspect ratio value: %s, setting stretched\n", aspect_ratio);
-      aspect_ratio = ASPECT_RATIOS_TYPE_STRETCHED;
+      printf("Wrong aspect ratio value: %s, setting cropped\n", aspect_ratio);
+      aspect_ratio = ASPECT_RATIOS_TYPE_CROPPED;
       break;
     }
 

package

@@ -100,7 +100,7 @@ int brightness_percentage = 0;
 #undef X
 #define X(a, b) b,
 const char *aspect_ratio_name[] = {ASPECT_RATIOS};
-int aspect_ratio = ASPECT_RATIOS_TYPE_STRETCHED;
+int aspect_ratio = ASPECT_RATIOS_TYPE_CROPPED;
 int aspect_ratio_factor_percent = 50;
 int aspect_ratio_factor_step = 10;