Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 6 May 2025 15:51:04 GMT
From:      Alexander Ziaee <ziaee@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 1ec2c8b2f364 - main - stand: Enable Spleen 32x64 font in the bootloader
Message-ID:  <202505061551.546Fp4gt029675@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by ziaee:

URL: https://cgit.FreeBSD.org/src/commit/?id=1ec2c8b2f364cc8294ba06d64a167bca4b1b6bbb

commit 1ec2c8b2f364cc8294ba06d64a167bca4b1b6bbb
Author:     Alexander Ziaee <ziaee@FreeBSD.org>
AuthorDate: 2025-04-06 10:49:24 +0000
Commit:     Alexander Ziaee <ziaee@FreeBSD.org>
CommitDate: 2025-05-06 15:50:28 +0000

    stand: Enable Spleen 32x64 font in the bootloader
    
    Spleen 32x64 provides my 14" 2560x1600 display with the ancestral 80x25,
    BSD standard console. We already include it in contrib, and it is built
    for the runtime vt(4) font directory, but was previously unavailable to
    the bootloader. Enable it in the build, selectable in loader.conf with:
    
    screen.font="32x64"
    
    MFC after:              3 days
    Reviewed by:            adrian, carlavilla, emaste, imp, mhorne, tsoome
    Approved by:            imp, tsoome (loader)
    Approved by:            mhorne (mentor)
    Differential Revision:  https://reviews.freebsd.org/D49768
---
 stand/fonts/INDEX.fonts | 3 +++
 stand/fonts/Makefile    | 7 +++++++
 2 files changed, 10 insertions(+)

diff --git a/stand/fonts/INDEX.fonts b/stand/fonts/INDEX.fonts
index fc035c6b2e4e..66a6d8a9a3f5 100644
--- a/stand/fonts/INDEX.fonts
+++ b/stand/fonts/INDEX.fonts
@@ -60,6 +60,9 @@ FONT:en:8x16v.fnt
 16x32.fnt:en:Terminus BSD Console, size 32
 16x32.fnt:da:Terminus BSD-konsol, størrelse 32
 16x32.fnt:de:Terminus BSD Console, Größe 32
+32x64.fnt:en:Spleen BSD Console, size 64
+32x64.fnt:da:Spleen BSD-konsol, størrelse 64
+32x64.fnt:de:Spleen BSD Console, Größe 64
 
 # (fset 'langnew
 #   "\M-}\C-p\C-k\C-y\C-m\C-y\M-}")
diff --git a/stand/fonts/Makefile b/stand/fonts/Makefile
index 3ac1b0bac951..4840c07201d6 100644
--- a/stand/fonts/Makefile
+++ b/stand/fonts/Makefile
@@ -1,5 +1,6 @@
 .include <bsd.init.mk>
 
+.PATH: ${SRCTOP}/contrib/spleen
 .PATH: ${SRCTOP}/contrib/terminus
 
 FONTS=	\
@@ -15,6 +16,7 @@ FONTS=	\
 	12x24.fnt.gz \
 	14x28.fnt.gz \
 	16x32.fnt.gz \
+	32x64.fnt.gz \
 
 FILES=	${FONTS} INDEX.fonts
 FILESDIR=	/boot/fonts
@@ -45,6 +47,8 @@ CLEANFILES+=	${FONTS} ${FONTS:T:S/${COMPRESS_EXT}//g}
 	${COMPRESS_CMD} ${.ALLSRC} > ${.TARGET}
 16x32.fnt.gz: 16x32.fnt
 	${COMPRESS_CMD} ${.ALLSRC} > ${.TARGET}
+32x64.fnt.gz: 32x64.fnt
+	${COMPRESS_CMD} ${.ALLSRC} > ${.TARGET}
 
 6x12.fnt: ter-u12n.bdf ter-u12b.bdf
 	vtfontcvt -o ${.TARGET} ${.ALLSRC}
@@ -82,4 +86,7 @@ CLEANFILES+=	${FONTS} ${FONTS:T:S/${COMPRESS_EXT}//g}
 16x32.fnt: ter-u32n.bdf ter-u32b.bdf
 	vtfontcvt -o ${.TARGET} ${.ALLSRC}
 
+32x64.fnt: spleen-32x64.bdf
+	vtfontcvt -o ${.TARGET} ${.ALLSRC}
+
 .include <bsd.prog.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202505061551.546Fp4gt029675>