diff --git a/board/miyoo/main/apps/ffmpeg/ffplay_launch.sh b/board/miyoo/main/apps/ffmpeg/ffplay_launch.sh index d77b69b6..f33ad4b7 100644 --- a/board/miyoo/main/apps/ffmpeg/ffplay_launch.sh +++ b/board/miyoo/main/apps/ffmpeg/ffplay_launch.sh @@ -8,5 +8,5 @@ else echo -en "Invalid video/audio format!" # We're using SDL terminal to display above echo msg ## because all stdout is parsed to /dev/null from gmenu2x and it's child ps - /mnt/apps/st/st -e "/bin/sh" "-c" "echo -e \"\n\n\n\n\n\n Invalid video or audio format!\"; sleep 2" + st -k -e "/bin/sh" "-c" "echo -e \"\n\n\n\n\n\n Invalid video or audio format!\"; sleep 2" fi diff --git a/board/miyoo/main/apps/st/st b/board/miyoo/main/apps/st/st deleted file mode 100644 index f689f2f3..00000000 Binary files a/board/miyoo/main/apps/st/st and /dev/null differ diff --git a/board/miyoo/main/apps/st/st.png b/board/miyoo/main/apps/st/st.png deleted file mode 100644 index e012f144..00000000 Binary files a/board/miyoo/main/apps/st/st.png and /dev/null differ diff --git a/board/miyoo/main/gmenu2x/sections/applications/fsck b/board/miyoo/main/gmenu2x/sections/applications/fsck index 0c6070ba..d40af52d 100644 --- a/board/miyoo/main/gmenu2x/sections/applications/fsck +++ b/board/miyoo/main/gmenu2x/sections/applications/fsck @@ -1,3 +1,3 @@ -title=File System Check -exec=/mnt/apps/st/st -params=-e /mnt/apps/fsck/fsck.sh +title=File System Check +exec=/usr/bin/st +params=-k -e /mnt/apps/fsck/fsck.sh diff --git a/board/miyoo/main/gmenu2x/sections/applications/st b/board/miyoo/main/gmenu2x/sections/applications/st index 4fe6b9a4..27391788 100644 --- a/board/miyoo/main/gmenu2x/sections/applications/st +++ b/board/miyoo/main/gmenu2x/sections/applications/st @@ -1,3 +1,3 @@ -title=Terminal -description=ST Terminal Emulator -exec=/mnt/apps/st/st +title=Terminal +description=ST Terminal Emulator +exec=/usr/bin/st diff --git a/configs/miyoo_musl_defconfig b/configs/miyoo_musl_defconfig index 7bff954c..880ee4d4 100644 --- a/configs/miyoo_musl_defconfig +++ b/configs/miyoo_musl_defconfig @@ -221,6 +221,7 @@ BR2_PACKAGE_MIYOO_DAEMON=y BR2_PACKAGE_MIYOO_LOGO=y BR2_PACKAGE_MIYOO_CTL=y BR2_PACKAGE_FBCAT=y +BR2_PACKAGE_ST_SDL=y BR2_PACKAGE_OPKG=y BR2_PACKAGE_OPKG_UTILS=y BR2_PACKAGE_DIALOG=y diff --git a/configs/miyoo_uclibc_defconfig b/configs/miyoo_uclibc_defconfig index 39bdf328..47a2ff01 100644 --- a/configs/miyoo_uclibc_defconfig +++ b/configs/miyoo_uclibc_defconfig @@ -198,6 +198,7 @@ BR2_PACKAGE_MIYOO_DAEMON=y BR2_PACKAGE_MIYOO_LOGO=y BR2_PACKAGE_MIYOO_CTL=y BR2_PACKAGE_FBCAT=y +BR2_PACKAGE_ST_SDL=y BR2_PACKAGE_OPKG=y BR2_PACKAGE_OPKG_UTILS=y BR2_PACKAGE_DIALOG=y diff --git a/package/Config.in b/package/Config.in index ad8df716..78c23f85 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2212,6 +2212,7 @@ menu "Miscellaneous" source "package/miyoo-logo/Config.in" source "package/miyoo-ctl/Config.in" source "package/fbcat/Config.in" + source "package/st-sdl/Config.in" endmenu diff --git a/package/st-sdl/Config.in b/package/st-sdl/Config.in new file mode 100644 index 00000000..489e5b63 --- /dev/null +++ b/package/st-sdl/Config.in @@ -0,0 +1,5 @@ +config BR2_PACKAGE_ST_SDL + bool "st-sdl" + help + Simple SDL terminal + diff --git a/package/st-sdl/st-sdl.mk b/package/st-sdl/st-sdl.mk new file mode 100644 index 00000000..6929f1b4 --- /dev/null +++ b/package/st-sdl/st-sdl.mk @@ -0,0 +1,13 @@ +ST_SDL_VERSION = rev.2.1 +ST_SDL_SITE_METHOD = git +ST_SDL_SITE = https://github.com/Apaczer/miyoo_st-sdl +ST_SDL_DEPENDENCIES = sdl +define ST_SDL_BUILD_CMDS + $(MAKE) CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" LD="$(TARGET_LD)" -C $(@D) -f Makefile.miyoo +endef + +define ST_SDL_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/st $(TARGET_DIR)/usr/bin +endef + +$(eval $(generic-package))