mirror of
https://github.com/AsahiLinux/m1n1
synced 2024-11-21 22:23:05 +00:00
fb console: add Source Code Pro font
This font is licensed under the OFL-1.1 License and copyright: Copyright 2010-2019 Adobe (http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe in the United States and/or other countries. Signed-off-by: Sven Peter <sven@svenpeter.dev>
This commit is contained in:
parent
f80933a7d3
commit
05e7306bf9
9 changed files with 136 additions and 1 deletions
93
3rdparty_licenses/LICENSE.OFL-1.1
Normal file
93
3rdparty_licenses/LICENSE.OFL-1.1
Normal file
|
@ -0,0 +1,93 @@
|
||||||
|
Copyright 2010-2019 Adobe (http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe in the United States and/or other countries.
|
||||||
|
|
||||||
|
This Font Software is licensed under the SIL Open Font License, Version 1.1.
|
||||||
|
|
||||||
|
This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL
|
||||||
|
|
||||||
|
|
||||||
|
-----------------------------------------------------------
|
||||||
|
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
|
||||||
|
-----------------------------------------------------------
|
||||||
|
|
||||||
|
PREAMBLE
|
||||||
|
The goals of the Open Font License (OFL) are to stimulate worldwide
|
||||||
|
development of collaborative font projects, to support the font creation
|
||||||
|
efforts of academic and linguistic communities, and to provide a free and
|
||||||
|
open framework in which fonts may be shared and improved in partnership
|
||||||
|
with others.
|
||||||
|
|
||||||
|
The OFL allows the licensed fonts to be used, studied, modified and
|
||||||
|
redistributed freely as long as they are not sold by themselves. The
|
||||||
|
fonts, including any derivative works, can be bundled, embedded,
|
||||||
|
redistributed and/or sold with any software provided that any reserved
|
||||||
|
names are not used by derivative works. The fonts and derivatives,
|
||||||
|
however, cannot be released under any other type of license. The
|
||||||
|
requirement for fonts to remain under this license does not apply
|
||||||
|
to any document created using the fonts or their derivatives.
|
||||||
|
|
||||||
|
DEFINITIONS
|
||||||
|
"Font Software" refers to the set of files released by the Copyright
|
||||||
|
Holder(s) under this license and clearly marked as such. This may
|
||||||
|
include source files, build scripts and documentation.
|
||||||
|
|
||||||
|
"Reserved Font Name" refers to any names specified as such after the
|
||||||
|
copyright statement(s).
|
||||||
|
|
||||||
|
"Original Version" refers to the collection of Font Software components as
|
||||||
|
distributed by the Copyright Holder(s).
|
||||||
|
|
||||||
|
"Modified Version" refers to any derivative made by adding to, deleting,
|
||||||
|
or substituting -- in part or in whole -- any of the components of the
|
||||||
|
Original Version, by changing formats or by porting the Font Software to a
|
||||||
|
new environment.
|
||||||
|
|
||||||
|
"Author" refers to any designer, engineer, programmer, technical
|
||||||
|
writer or other person who contributed to the Font Software.
|
||||||
|
|
||||||
|
PERMISSION & CONDITIONS
|
||||||
|
Permission is hereby granted, free of charge, to any person obtaining
|
||||||
|
a copy of the Font Software, to use, study, copy, merge, embed, modify,
|
||||||
|
redistribute, and sell modified and unmodified copies of the Font
|
||||||
|
Software, subject to the following conditions:
|
||||||
|
|
||||||
|
1) Neither the Font Software nor any of its individual components,
|
||||||
|
in Original or Modified Versions, may be sold by itself.
|
||||||
|
|
||||||
|
2) Original or Modified Versions of the Font Software may be bundled,
|
||||||
|
redistributed and/or sold with any software, provided that each copy
|
||||||
|
contains the above copyright notice and this license. These can be
|
||||||
|
included either as stand-alone text files, human-readable headers or
|
||||||
|
in the appropriate machine-readable metadata fields within text or
|
||||||
|
binary files as long as those fields can be easily viewed by the user.
|
||||||
|
|
||||||
|
3) No Modified Version of the Font Software may use the Reserved Font
|
||||||
|
Name(s) unless explicit written permission is granted by the corresponding
|
||||||
|
Copyright Holder. This restriction only applies to the primary font name as
|
||||||
|
presented to the users.
|
||||||
|
|
||||||
|
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
|
||||||
|
Software shall not be used to promote, endorse or advertise any
|
||||||
|
Modified Version, except to acknowledge the contribution(s) of the
|
||||||
|
Copyright Holder(s) and the Author(s) or with their explicit written
|
||||||
|
permission.
|
||||||
|
|
||||||
|
5) The Font Software, modified or unmodified, in part or in whole,
|
||||||
|
must be distributed entirely under this license, and must not be
|
||||||
|
distributed under any other license. The requirement for fonts to
|
||||||
|
remain under this license does not apply to any document created
|
||||||
|
using the Font Software.
|
||||||
|
|
||||||
|
TERMINATION
|
||||||
|
This license becomes null and void if any of the above conditions are
|
||||||
|
not met.
|
||||||
|
|
||||||
|
DISCLAIMER
|
||||||
|
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||||
|
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
|
||||||
|
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
|
||||||
|
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
|
||||||
|
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||||
|
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
|
||||||
|
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||||
|
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
|
||||||
|
OTHER DEALINGS IN THE FONT SOFTWARE.
|
6
Makefile
6
Makefile
|
@ -41,7 +41,7 @@ OBJECTS := \
|
||||||
chickens.o \
|
chickens.o \
|
||||||
dart.o \
|
dart.o \
|
||||||
exception.o exception_asm.o \
|
exception.o exception_asm.o \
|
||||||
fb.o \
|
fb.o font.o font_retina.o \
|
||||||
heapblock.o \
|
heapblock.o \
|
||||||
kboot.o \
|
kboot.o \
|
||||||
main.o \
|
main.o \
|
||||||
|
@ -122,6 +122,10 @@ build/%.o: build/%.bin
|
||||||
@echo " BIN $@"
|
@echo " BIN $@"
|
||||||
@$(OBJCOPY) -I binary -B aarch64 -O elf64-littleaarch64 $< $@
|
@$(OBJCOPY) -I binary -B aarch64 -O elf64-littleaarch64 $< $@
|
||||||
|
|
||||||
|
build/%.bin: font/%.bin
|
||||||
|
@echo " CP $@"
|
||||||
|
@cp $< $@
|
||||||
|
|
||||||
build/main.o: build/build_tag.h src/main.c
|
build/main.o: build/build_tag.h src/main.c
|
||||||
|
|
||||||
-include $(DEPDIR)/*
|
-include $(DEPDIR)/*
|
||||||
|
|
|
@ -102,3 +102,8 @@ the public domain ([CC0](3rdparty_licenses/LICENSE.CC0)).
|
||||||
m1n1 embeds portions of [PDCLib](https://github.com/DevSolar/pdclib), which is in the public
|
m1n1 embeds portions of [PDCLib](https://github.com/DevSolar/pdclib), which is in the public
|
||||||
domain ([CC0](3rdparty_licenses/LICENSE.CC0)).
|
domain ([CC0](3rdparty_licenses/LICENSE.CC0)).
|
||||||
|
|
||||||
|
m1n1 embeds the [Source Code Pro](https://github.com/adobe-fonts/source-code-pro) font, which is
|
||||||
|
licensed under the [OFL-1.1](3rdparty_licenses/LICENSE.OFL-1.1) license and copyright:
|
||||||
|
|
||||||
|
* Copyright 2010-2019 Adobe (http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe in the United States and/or other countries.
|
||||||
|
* This Font Software is licensed under the SIL Open Font License, Version 1.1.
|
||||||
|
|
3
font/README.md
Normal file
3
font/README.md
Normal file
|
@ -0,0 +1,3 @@
|
||||||
|
These fonts have been generated with
|
||||||
|
makefont.sh 8 16 12 SourceCodePro-Bold.ttf font.bin
|
||||||
|
makefont.sh 16 32 25 SourceCodePro-Bold.ttf font_retina.bin
|
BIN
font/SourceCodePro-Bold.ttf
Normal file
BIN
font/SourceCodePro-Bold.ttf
Normal file
Binary file not shown.
BIN
font/font.bin
Normal file
BIN
font/font.bin
Normal file
Binary file not shown.
BIN
font/font_retina.bin
Normal file
BIN
font/font_retina.bin
Normal file
Binary file not shown.
27
font/makefont.sh
Executable file
27
font/makefont.sh
Executable file
|
@ -0,0 +1,27 @@
|
||||||
|
#!/bin/bash
|
||||||
|
width=$1
|
||||||
|
height=$2
|
||||||
|
size=$3
|
||||||
|
fontfile=$4
|
||||||
|
outfile=$5
|
||||||
|
shift 5
|
||||||
|
|
||||||
|
(
|
||||||
|
for ord in $(seq 32 126); do
|
||||||
|
printf "\\x$(printf %x $ord)\\n"
|
||||||
|
done
|
||||||
|
) | convert \
|
||||||
|
-page ${width}x$((height*95)) \
|
||||||
|
-background black \
|
||||||
|
-fill white \
|
||||||
|
-antialias \
|
||||||
|
-font $fontfile \
|
||||||
|
-density 72 \
|
||||||
|
-gravity north \
|
||||||
|
-pointsize $size \
|
||||||
|
$* \
|
||||||
|
-define quantum:format=unsigned \
|
||||||
|
-depth 8 \
|
||||||
|
label:\@- \
|
||||||
|
-crop ${width}x$((height*95)) \
|
||||||
|
gray:$outfile
|
3
src/fb.c
3
src/fb.c
|
@ -14,6 +14,9 @@ static int logo_w, logo_h;
|
||||||
extern char _binary_build_bootlogo_128_bin_start[0];
|
extern char _binary_build_bootlogo_128_bin_start[0];
|
||||||
extern char _binary_build_bootlogo_256_bin_start[0];
|
extern char _binary_build_bootlogo_256_bin_start[0];
|
||||||
|
|
||||||
|
extern u8 _binary_build_font_bin_start[];
|
||||||
|
extern u8 _binary_build_font_retina_bin_start[];
|
||||||
|
|
||||||
void fb_init(void)
|
void fb_init(void)
|
||||||
{
|
{
|
||||||
fb = (void *)cur_boot_args.video.base;
|
fb = (void *)cur_boot_args.video.base;
|
||||||
|
|
Loading…
Reference in a new issue