Add commander

.github/workflows/main.yml

@@ -16,7 +16,7 @@ concurrency:
 jobs:
   build:
     name: Build
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     container:
       image: ghcr.io/opendingux/retro-toolchain/buildroot
 

board/opendingux/Config.in

@@ -1,6 +1,7 @@
 menu "OpenDingux packages"
 
 	source "$BR2_EXTERNAL_OPENDINGUX_PATH/package/bennugd/Config.in"
+	source "$BR2_EXTERNAL_OPENDINGUX_PATH/package/commander/Config.in"
 	source "$BR2_EXTERNAL_OPENDINGUX_PATH/package/fonts-droid/Config.in"
 	source "$BR2_EXTERNAL_OPENDINGUX_PATH/package/gcwconnect/Config.in"
 	source "$BR2_EXTERNAL_OPENDINGUX_PATH/package/gl4es/Config.in"

board/opendingux/package/commander/Config.in

@@ -0,0 +1,20 @@
+config BR2_PACKAGE_COMMANDER
+	bool "commander"
+	select BR2_PACKAGE_SDL
+	select BR2_PACKAGE_SDL_GFX
+	select BR2_PACKAGE_SDL_IMAGE
+	select BR2_PACKAGE_SDL_TTF
+	select BR2_PACKAGE_DEJAVU
+	select BR2_PACKAGE_FONTS_DROID
+	help
+	  Two-pane file manager in the style of Norton Commander.
+
+	  https://github.com/od-contrib/commander
+
+if BR2_PACKAGE_COMMANDER
+
+config BR2_PACKAGE_COMMANDER_PLATFORM
+	string "Target platform: for key bindings, default folder locations, and the manual"
+	default "gcw0"
+
+endif

board/opendingux/package/commander/commander.hash

@@ -0,0 +1,2 @@
+# Locally calculated (fetched from Github)
+sha256 c72910fb8c638ef2f5f448973e284815f5710938e6706c4b7ae805e7ba81ba14  commander-2022-11-01.tar.gz

board/opendingux/package/commander/commander.mk

@@ -0,0 +1,60 @@
+################################################################################
+#
+# DinguxCommander
+#
+################################################################################
+
+COMMANDER_VERSION = 2022-11-01
+COMMANDER_SITE = $(call github,od-contrib,commander,$(COMMANDER_VERSION))
+COMMANDER_DEPENDENCIES = sdl sdl_gfx sdl_image sdl_ttf dejavu fonts-droid
+
+COMMANDER_RESOURCES_DIR = /usr/share/commander/
+COMMANDER_PLATFORM=$(call qstrip,$(BR2_PACKAGE_COMMANDER_PLATFORM))
+
+COMMANDER_CONF_OPTS += \
+	-DWITH_SYSTEM_SDL_GFX=ON -DWITH_SYSTEM_SDL_TTF=ON \
+	-DFONTS="{\"/usr/share/fonts/dejavu/DejaVuSansCondensed.ttf\",10},{\"/usr/share/fonts/truetype/droid/DroidSansFallback.ttf\",9}" \
+	-DLOW_DPI_FONTS="{RES_DIR\"Fiery_Turk.ttf\",8},{\"/usr/share/fonts/dejavu/DejaVuSansCondensed.ttf\",10},{\"/usr/share/fonts/truetype/droid/DroidSansFallback.ttf\",9}" \
+	-DFILE_SYSTEM=\"/dev/mmcblk0p2\" \
+	-DRES_DIR="\"$(COMMANDER_RESOURCES_DIR)\"" \
+	-DTARGET_PLATFORM=$(COMMANDER_PLATFORM)
+
+define COMMANDER_INSTALL_TARGET_CMDS
+	mkdir -p $(TARGET_DIR)$(COMMANDER_RESOURCES_DIR)
+	$(INSTALL) -m 0644 $(@D)/res/Fiery_Turk.ttf \
+	  $(TARGET_DIR)$(COMMANDER_RESOURCES_DIR)
+	$(INSTALL) -m 0644 $(@D)/res/*.png \
+	  $(TARGET_DIR)$(COMMANDER_RESOURCES_DIR)
+	$(INSTALL) -m 0644 $(@D)/opkg/readme.$(COMMANDER_PLATFORM).txt \
+	  $(TARGET_DIR)$(COMMANDER_RESOURCES_DIR)readme.txt
+endef
+
+define COMMANDER_INSTALL_DEFAULT
+	$(INSTALL) -m 0755 -D $(COMMANDER_BUILDDIR)commander \
+	  $(TARGET_DIR)/usr/bin/commander
+endef
+
+define COMMANDER_INSTALL_RS90_RG99
+	$(INSTALL) -m 0755 -D $(COMMANDER_BUILDDIR)commander \
+	  $(TARGET_DIR)/usr/libexec/commander
+	$(INSTALL) -m 0755 -D $(BR2_EXTERNAL_OPENDINGUX_PATH)/package/commander/commander.sh \
+	  $(TARGET_DIR)/usr/bin/commander
+	$(INSTALL) -m 0644 $(@D)/opkg/commander.rg99.cfg \
+	  $(TARGET_DIR)$(COMMANDER_RESOURCES_DIR)
+endef
+
+ifeq ($(COMMANDER_PLATFORM),rs90)
+COMMANDER_POST_INSTALL_TARGET_HOOKS += COMMANDER_INSTALL_RS90_RG99
+else
+COMMANDER_POST_INSTALL_TARGET_HOOKS += COMMANDER_INSTALL_DEFAULT
+endif
+
+ifeq ($(BR2_PACKAGE_GMENU2X),y)
+define COMMANDER_INSTALL_TARGET_GMENU2X
+	$(INSTALL) -m 0644 -D $(BR2_EXTERNAL_OPENDINGUX_PATH)/package/commander/gmenu2x \
+	  $(TARGET_DIR)/usr/share/gmenu2x/sections/applications/25_commander
+endef
+COMMANDER_POST_INSTALL_TARGET_HOOKS += COMMANDER_INSTALL_TARGET_GMENU2X
+endif
+
+$(eval $(cmake-package))

board/opendingux/package/commander/commander.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+IFS= read -r -d $'\0' MODEL </sys/firmware/devicetree/base/compatible
+case $MODEL in
+	rg99)
+		exec /usr/libexec/commander --config-prelude /usr/share/commander/commander.rg99.cfg
+		;;
+	*)
+		exec /usr/libexec/commander
+esac

board/opendingux/package/commander/gmenu2x

@@ -0,0 +1,5 @@
+title=Commander
+description=Two-pane file manager
+exec=/usr/bin/commander
+icon=skin:icons/dinguxcmdr.png
+manual=/usr/share/commander/readme.txt

configs/od_gcw0_defconfig

@@ -218,6 +218,8 @@ BR2_PACKAGE_LIBOPK=y
 BR2_PACKAGE_LIBPNG14=y
 BR2_PACKAGE_LIBSHAKE=y
 BR2_PACKAGE_LIBXDGMIME=y
+BR2_PACKAGE_COMMANDER=y
+BR2_PACKAGE_COMMANDER_PLATFORM="gcw0"
 BR2_PACKAGE_LOVE2D=y
 BR2_PACKAGE_MININIT=y
 BR2_PACKAGE_OD_PASSWD_CONFIG=y

configs/od_lepus_defconfig

@@ -134,6 +134,8 @@ BR2_TARGET_ROOTFS_SQUASHFS4_ZSTD=y
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_PACKAGE_HOST_MKPASSWD=y
 BR2_PACKAGE_BENNUGD=y
+BR2_PACKAGE_COMMANDER=y
+BR2_PACKAGE_COMMANDER_PLATFORM="lepus"
 BR2_PACKAGE_GMENU2X=y
 BR2_PACKAGE_GMENU2X_SHOW_CLOCK=y
 BR2_PACKAGE_GMENU2X_CPUFREQ=y

configs/od_rs90_defconfig

@@ -128,6 +128,8 @@ BR2_PACKAGE_NANO=y
 BR2_TARGET_ROOTFS_SQUASHFS=y
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_PACKAGE_HOST_MKPASSWD=y
+BR2_PACKAGE_COMMANDER=y
+BR2_PACKAGE_COMMANDER_PLATFORM="rs90"
 BR2_PACKAGE_GMENU2X=y
 BR2_PACKAGE_GMENU2X_CPUFREQ=y
 BR2_PACKAGE_KMSGRAB=y