Skip to content

Commit 6032a55

Browse files
schodetlaurensvalk
authored andcommitted
pbio/image/fonts: Import Liberation and Terminus fonts.
LiberationSans-Regular.ttf comes from https://github.com/liberationfonts, version 2.1.5, license OFL-1.1-RFN: Digitized data copyright (c) 2010 Google Corporation with Reserved Font Arimo, Tinos and Cousine. Copyright (c) 2012 Red Hat, Inc. with Reserved Font Name Liberation. terminus-normal.otb comes from https://terminus-font.sourceforge.net/, version 4.48, license OFL-1.1-RFN: Copyright (c) 2010-2014 Dimitar Toshkov Zhekov, with Reserved Font Name "Terminus Font". They were previously read from the local file system. Also move NxOS font in fonts directory.
1 parent 1b3aa24 commit 6032a55

4 files changed

Lines changed: 3 additions & 3 deletions

File tree

lib/pbio/src/image/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ LIBERATION_COPYRIGHT = \
88
--copyright " with Reserved Font Arimo, Tinos and Cousine." \
99
--copyright "Copyright (c) 2012 Red Hat, Inc." \
1010
--copyright " with Reserved Font Name Liberation."
11-
LIBERATION_SANS_REGULAR = /usr/share/fonts/truetype/liberation/LiberationSans-Regular.ttf
11+
LIBERATION_SANS_REGULAR = fonts/LiberationSans-Regular.ttf
1212

1313
TERMINUS_LICENSE = "OFL-1.1-RFN"
1414
TERMINUS_COPYRIGHT = \
1515
--copyright "Copyright (c) 2010-2014 Dimitar Toshkov Zhekov," \
1616
--copyright ' with Reserved Font Name "Terminus Font".'
17-
TERMINUS_NORMAL = /usr/share/fonts/opentype/terminus/terminus-normal.otb
17+
TERMINUS_NORMAL = fonts/terminus-normal.otb
1818

1919
NXOS_LICENSE = "GPL-2.0-only"
2020
NXOS_COPYRIGHT = \
@@ -28,7 +28,7 @@ font_liberationsans_regular_14.c: $(LIBERATION_SANS_REGULAR) $(FONTCONVERT)
2828
font_terminus_normal_16.c: $(TERMINUS_NORMAL) $(FONTCONVERT)
2929
python3 $(FONTCONVERT) $< 16 --license $(TERMINUS_LICENSE) $(TERMINUS_COPYRIGHT) > $@
3030

31-
font_mono_8x5_8.c: mono_8x5.png $(FONTCONVERT)
31+
font_mono_8x5_8.c: fonts/mono_8x5.png $(FONTCONVERT)
3232
python3 $(FONTCONVERT) --image $< 8 --license $(NXOS_LICENSE) $(NXOS_COPYRIGHT) > $@
3333

3434
.DELETE_ON_ERROR:
401 KB
Binary file not shown.
370 KB
Binary file not shown.

0 commit comments

Comments
 (0)