Re-enable spleen now that it has been patched to show the logo correctly.
This commit is contained in:
parent
878d852037
commit
f07cd19628
6 changed files with 121 additions and 15 deletions
|
@ -430,15 +430,15 @@ set_consolefont() {
|
||||||
hres="$(fbset 2>/dev/null | awk '/geometry/ { print $2 }')"
|
hres="$(fbset 2>/dev/null | awk '/geometry/ { print $2 }')"
|
||||||
if [ "${hres}" -gt "0" ] && [ "${hres}" -le "640" ]
|
if [ "${hres}" -gt "0" ] && [ "${hres}" -le "640" ]
|
||||||
then
|
then
|
||||||
setfont -C /dev/console ter-v12n.psf
|
setfont -C /dev/console spleen-5x8.psfu
|
||||||
elif [ "${hres}" -ge "641" ] && [ "${hres}" -lt "720" ]
|
elif [ "${hres}" -ge "641" ] && [ "${hres}" -le "720" ]
|
||||||
then
|
then
|
||||||
setfont -C /dev/console ter-v14n.psf
|
setfont -C /dev/console spleen-6x12.psfu
|
||||||
elif [ "${hres}" -ge "720" ] && [ "${hres}" -lt "1080" ]
|
elif [ "${hres}" -gt "720" ] && [ "${hres}" -lt "1080" ]
|
||||||
then
|
then
|
||||||
setfont -C /dev/console ter-v18n.psf
|
setfont -C /dev/console spleen-8x16.psfu
|
||||||
else
|
else
|
||||||
setfont -C /dev/console ter-v24n.psf
|
setfont -C /dev/console spleen-12x24.psfu
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,8 +7,8 @@ PKG_LICENSE="BSD-2-Clause"
|
||||||
PKG_SITE="https://github.com/fcambus/spleen"
|
PKG_SITE="https://github.com/fcambus/spleen"
|
||||||
PKG_URL="${PKG_SITE}/releases/download/${PKG_VERSION}/spleen-${PKG_VERSION}.tar.gz"
|
PKG_URL="${PKG_SITE}/releases/download/${PKG_VERSION}/spleen-${PKG_VERSION}.tar.gz"
|
||||||
|
|
||||||
PKG_DEPENDS_INIT="toolchain"
|
PKG_DEPENDS_INIT="toolchain bdf2psf:host"
|
||||||
PKG_DEPENDS_TARGET="toolchain"
|
PKG_DEPENDS_TARGET="toolchain bdf2psf:host"
|
||||||
PKG_LONGDESC="This package contains the Spleen Font"
|
PKG_LONGDESC="This package contains the Spleen Font"
|
||||||
PKG_TOOLCHAIN="manual"
|
PKG_TOOLCHAIN="manual"
|
||||||
|
|
||||||
|
@ -31,11 +31,18 @@ configure_target() {
|
||||||
}
|
}
|
||||||
|
|
||||||
make_init() {
|
make_init() {
|
||||||
:
|
for font in spleen-5x8 spleen-6x12
|
||||||
|
do
|
||||||
|
${TOOLCHAIN}/usr/bin/bdf2psf --fb \
|
||||||
|
${font}.bdf \
|
||||||
|
${TOOLCHAIN}/usr/share/bdf2psf/standard.equivalents \
|
||||||
|
${TOOLCHAIN}/usr/share/bdf2psf/ascii.set+${TOOLCHAIN}/usr/share/bdf2psf/linux.set+${TOOLCHAIN}/usr/share/bdf2psf/useful.set 512 \
|
||||||
|
${font}.psfu
|
||||||
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
make_target() {
|
make_target() {
|
||||||
:
|
make_init
|
||||||
}
|
}
|
||||||
|
|
||||||
makeinstall_init() {
|
makeinstall_init() {
|
||||||
|
|
59
packages/sysutils/spleen-font/patches/001-add-block.patch
Normal file
59
packages/sysutils/spleen-font/patches/001-add-block.patch
Normal file
|
@ -0,0 +1,59 @@
|
||||||
|
diff -rupN spleen-2.0.0.orig/spleen-5x8.bdf spleen-2.0.0/spleen-5x8.bdf
|
||||||
|
--- spleen-2.0.0.orig/spleen-5x8.bdf 2023-10-17 11:29:44.898274937 +0000
|
||||||
|
+++ spleen-2.0.0/spleen-5x8.bdf 2023-10-17 12:21:00.033250208 +0000
|
||||||
|
@@ -37,7 +37,7 @@ COPYRIGHT "Copyright (c) 2018-2023, Fred
|
||||||
|
DEFAULT_CHAR 32
|
||||||
|
_GBDFED_INFO "Edited with gbdfed 1.6."
|
||||||
|
ENDPROPERTIES
|
||||||
|
-CHARS 472
|
||||||
|
+CHARS 473
|
||||||
|
STARTCHAR SPACE
|
||||||
|
ENCODING 32
|
||||||
|
SWIDTH 625 0
|
||||||
|
@@ -7118,4 +7118,19 @@ BITMAP
|
||||||
|
20
|
||||||
|
10
|
||||||
|
ENDCHAR
|
||||||
|
+STARTCHAR FULL BLOCK
|
||||||
|
+ENCODING 9608
|
||||||
|
+SWIDTH 625 0
|
||||||
|
+DWIDTH 5 0
|
||||||
|
+BBX 5 8 0 -1
|
||||||
|
+BITMAP
|
||||||
|
+FF
|
||||||
|
+FF
|
||||||
|
+FF
|
||||||
|
+FF
|
||||||
|
+FF
|
||||||
|
+FF
|
||||||
|
+FF
|
||||||
|
+FF
|
||||||
|
+ENDCHAR
|
||||||
|
ENDFONT
|
||||||
|
diff -rupN spleen-2.0.0.orig/spleen-6x12.bdf spleen-2.0.0/spleen-6x12.bdf
|
||||||
|
--- spleen-2.0.0.orig/spleen-6x12.bdf 2023-10-17 11:29:44.898274937 +0000
|
||||||
|
+++ spleen-2.0.0/spleen-6x12.bdf 2023-10-17 12:22:31.486063337 +0000
|
||||||
|
@@ -9006,4 +9006,23 @@ BITMAP
|
||||||
|
08
|
||||||
|
04
|
||||||
|
ENDCHAR
|
||||||
|
+STARTCHAR FULL BLOCK
|
||||||
|
+ENCODING 9608
|
||||||
|
+SWIDTH 500 0
|
||||||
|
+DWIDTH 6 0
|
||||||
|
+BBX 6 12 0 -3
|
||||||
|
+BITMAP
|
||||||
|
+FF
|
||||||
|
+FF
|
||||||
|
+FF
|
||||||
|
+FF
|
||||||
|
+FF
|
||||||
|
+FF
|
||||||
|
+FF
|
||||||
|
+FF
|
||||||
|
+FF
|
||||||
|
+FF
|
||||||
|
+FF
|
||||||
|
+FF
|
||||||
|
+ENDCHAR
|
||||||
|
ENDFONT
|
25
packages/textproc/bdf2psf/package.mk
Normal file
25
packages/textproc/bdf2psf/package.mk
Normal file
|
@ -0,0 +1,25 @@
|
||||||
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
|
# Copyright (C) 2023-present JELOS (https://github.com/JustEnoughLinuxOS)
|
||||||
|
|
||||||
|
PKG_NAME="bdf2psf"
|
||||||
|
PKG_VERSION="1.221"
|
||||||
|
PKG_LICENSE="GPLv2"
|
||||||
|
PKG_SITE="https://packages.debian.org/unstable/${PKG_NAME}"
|
||||||
|
PKG_URL="https://deb.debian.org/debian/pool/main/c/console-setup/${PKG_NAME}_${PKG_VERSION}_all.deb"
|
||||||
|
PKG_DEPENDS_HOST="toolchain"
|
||||||
|
PKG_LONGDESC="Utility to convert BDF font files to PSF format"
|
||||||
|
PKG_TOOLCHAIN="manual"
|
||||||
|
|
||||||
|
unpack() {
|
||||||
|
mkdir -p ${PKG_BUILD}
|
||||||
|
cd ${PKG_BUILD}
|
||||||
|
ar x ${SOURCES}/${PKG_NAME}/${PKG_NAME}-${PKG_VERSION}.deb
|
||||||
|
tar -xf data.tar.xz
|
||||||
|
}
|
||||||
|
|
||||||
|
makeinstall_host() {
|
||||||
|
mkdir -p ${TOOLCHAIN}/usr/{bin,share}
|
||||||
|
cp ${PKG_BUILD}/usr/bin/${PKG_NAME} ${TOOLCHAIN}/usr/bin
|
||||||
|
cp -rf ${PKG_BUILD}/usr/share/* ${TOOLCHAIN}/usr/share
|
||||||
|
chmod 0755 ${TOOLCHAIN}/usr/bin/${PKG_NAME}
|
||||||
|
}
|
15
packages/ui/emulationstation/config/common/es_systems.cfg
Normal file
15
packages/ui/emulationstation/config/common/es_systems.cfg
Normal file
|
@ -0,0 +1,15 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<systemList>
|
||||||
|
<system>
|
||||||
|
<name>tools</name>
|
||||||
|
<fullname>Tools</fullname>
|
||||||
|
<manufacturer>JELOS</manufacturer>
|
||||||
|
<release>2021</release>
|
||||||
|
<hardware>system</hardware>
|
||||||
|
<path>/storage/.config/modules</path>
|
||||||
|
<extension>.sh</extension>
|
||||||
|
<command>/usr/bin/run %ROM%</command>
|
||||||
|
<platform>tools</platform>
|
||||||
|
<theme>tools</theme>
|
||||||
|
</system>
|
||||||
|
</systemList>
|
|
@ -115,13 +115,13 @@ makeinstall_target() {
|
||||||
|
|
||||||
mkdir -p ${INSTALL}/etc/emulationstation/
|
mkdir -p ${INSTALL}/etc/emulationstation/
|
||||||
ln -sf /storage/.config/emulationstation/themes ${INSTALL}/etc/emulationstation/
|
ln -sf /storage/.config/emulationstation/themes ${INSTALL}/etc/emulationstation/
|
||||||
|
|
||||||
|
cp -rf ${PKG_DIR}/config/common/*.cfg ${INSTALL}/usr/config/emulationstation
|
||||||
ln -sf /usr/config/emulationstation/es_systems.cfg ${INSTALL}/etc/emulationstation/es_systems.cfg
|
ln -sf /usr/config/emulationstation/es_systems.cfg ${INSTALL}/etc/emulationstation/es_systems.cfg
|
||||||
|
|
||||||
cp -rf ${PKG_DIR}/config/common/*.cfg ${INSTALL}/usr/config/emulationstation
|
if [ -d "${PKG_DIR}/config/device/${DEVICE}" ]; then
|
||||||
|
cp -rf ${PKG_DIR}/config/device/${DEVICE}/*.cfg ${INSTALL}/usr/config/emulationstation
|
||||||
if [ -d "${PKG_DIR}/config/device/${DEVICE}" ]; then
|
fi
|
||||||
cp -rf ${PKG_DIR}/config/device/${DEVICE}/*.cfg ${INSTALL}/usr/config/emulationstation
|
|
||||||
fi
|
|
||||||
|
|
||||||
ln -sf /storage/.cache/system_timezone ${INSTALL}/etc/timezone
|
ln -sf /storage/.cache/system_timezone ${INSTALL}/etc/timezone
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue