patches: Generate M+ fonts patch with script

1 files changed, 37 insertions, 44 deletions

diff --git a/patches/01_add-mplus-fonts.patch b/patches/01_add-mplus-fonts.patch
index 7de97b5..200369b 100644
--- a/patches/01_add-mplus-fonts.patch
+++ b/patches/01_add-mplus-fonts.patch
@@ -1,15 +1,8 @@
 Author: Patrick McDermott <patrick.mcdermott@libiquity.com>
 Subject: Add M+ fonts
 
-The lib/fonts/font_mplus_*.c files are generated from M+ version 063a using
-otf2bdf version 3.1 and bdf2fbcon commit 99d28cf as follows:
+Generated from M+ version 063a by scripts/gen-mplus-patch.pl
 
-	for p in 8 10 12 16 24 32; do
-		otf2bdf -p ${p} -r 72 path/to/mplus-1m-regular.ttf | \
-			path/to/bdf2fbcon -n mplus-1m-regular -p 2 -
-	done
-
-bdf2fbcon: <http://git.proteanos.com/bdf2fbcon/bdf2fbcon.git/>
 ---
  include/linux/font.h                    |   14 
  lib/fonts/Kconfig                       |   48 
@@ -23,10 +16,10 @@ bdf2fbcon: <http://git.proteanos.com/bdf2fbcon/bdf2fbcon.git/>
  lib/fonts/fonts.c                       |   24 
  10 files changed, 39927 insertions(+), 1 deletion(-)
 
-diff -Naurp src.orig/include/linux/font.h src/include/linux/font.h
---- src.orig/include/linux/font.h	2019-06-24 23:36:02.000000000 -0400
-+++ src/include/linux/font.h	2019-07-12 18:18:18.382494509 -0400
-@@ -32,6 +32,12 @@ struct font_desc {
+diff -Naur a/include/linux/font.h b/include/linux/font.h
+--- a/include/linux/font.h
++++ b/include/linux/font.h
+@@ -32,6 +32,12 @@
  #define ACORN8x8_IDX	8
  #define	MINI4x6_IDX	9
  #define FONT6x10_IDX	10
@@ -39,7 +32,7 @@ diff -Naurp src.orig/include/linux/font.h src/include/linux/font.h
  
  extern const struct font_desc	font_vga_8x8,
  			font_vga_8x16,
-@@ -43,7 +49,13 @@ extern const struct font_desc	font_vga_8
+@@ -43,7 +49,13 @@
  			font_sun_12x22,
  			font_acorn_8x8,
  			font_mini_4x6,
@@ -54,10 +47,10 @@ diff -Naurp src.orig/include/linux/font.h src/include/linux/font.h
  
  /* Find a font with a specific name */
  
-diff -Naurp src.orig/lib/fonts/Kconfig src/lib/fonts/Kconfig
---- src.orig/lib/fonts/Kconfig	2019-06-24 23:36:02.000000000 -0400
-+++ src/lib/fonts/Kconfig	2019-06-30 00:22:46.568889488 -0400
-@@ -109,6 +109,48 @@ config FONT_SUN12x22
+diff -Naur a/lib/fonts/Kconfig b/lib/fonts/Kconfig
+--- a/lib/fonts/Kconfig
++++ b/lib/fonts/Kconfig
+@@ -109,6 +109,48 @@
  	  big letters (like the letters used in the SPARC PROM). If the
  	  standard font is unreadable for you, say Y, otherwise say N.
  
@@ -106,7 +99,7 @@ diff -Naurp src.orig/lib/fonts/Kconfig src/lib/fonts/Kconfig
  config FONT_AUTOSELECT
  	def_bool y
  	depends on !FONT_8x8
-@@ -121,6 +163,12 @@ config FONT_AUTOSELECT
+@@ -121,6 +163,12 @@
  	depends on !FONT_SUN8x16
  	depends on !FONT_SUN12x22
  	depends on !FONT_10x18
@@ -119,10 +112,10 @@ diff -Naurp src.orig/lib/fonts/Kconfig src/lib/fonts/Kconfig
  	select FONT_8x16
  
  endif # FONT_SUPPORT
-diff -Naurp src.orig/lib/fonts/Makefile src/lib/fonts/Makefile
---- src.orig/lib/fonts/Makefile	2019-06-24 23:36:02.000000000 -0400
-+++ src/lib/fonts/Makefile	2019-06-30 00:17:55.377145329 -0400
-@@ -14,6 +14,12 @@ font-objs-$(CONFIG_FONT_PEARL_8x8) += fo
+diff -Naur a/lib/fonts/Makefile b/lib/fonts/Makefile
+--- a/lib/fonts/Makefile
++++ b/lib/fonts/Makefile
+@@ -14,6 +14,12 @@
  font-objs-$(CONFIG_FONT_ACORN_8x8) += font_acorn_8x8.o
  font-objs-$(CONFIG_FONT_MINI_4x6)  += font_mini_4x6.o
  font-objs-$(CONFIG_FONT_6x10)      += font_6x10.o
@@ -135,9 +128,9 @@ diff -Naurp src.orig/lib/fonts/Makefile src/lib/fonts/Makefile
  
  font-objs += $(font-objs-y)
  
-diff -Naurp src.orig/lib/fonts/font_mplus_1m_regular_10x14.c src/lib/fonts/font_mplus_1m_regular_10x14.c
---- src.orig/lib/fonts/font_mplus_1m_regular_10x14.c	1969-12-31 19:00:00.000000000 -0500
-+++ src/lib/fonts/font_mplus_1m_regular_10x14.c	2019-06-30 00:27:18.680659184 -0400
+diff -Naur a/lib/fonts/font_mplus_1m_regular_10x14.c b/lib/fonts/font_mplus_1m_regular_10x14.c
+--- a/lib/fonts/font_mplus_1m_regular_10x14.c
++++ b/lib/fonts/font_mplus_1m_regular_10x14.c
 @@ -0,0 +1,4122 @@
 +/*
 + * 
@@ -4261,9 +4254,9 @@ diff -Naurp src.orig/lib/fonts/font_mplus_1m_regular_10x14.c src/lib/fonts/font_
 +	.pref	= 2,
 +};
 +EXPORT_SYMBOL(font_mplus_1m_regular_10x14);
-diff -Naurp src.orig/lib/fonts/font_mplus_1m_regular_12x17.c src/lib/fonts/font_mplus_1m_regular_12x17.c
---- src.orig/lib/fonts/font_mplus_1m_regular_12x17.c	1969-12-31 19:00:00.000000000 -0500
-+++ src/lib/fonts/font_mplus_1m_regular_12x17.c	2019-06-30 00:27:19.320658652 -0400
+diff -Naur a/lib/fonts/font_mplus_1m_regular_12x17.c b/lib/fonts/font_mplus_1m_regular_12x17.c
+--- a/lib/fonts/font_mplus_1m_regular_12x17.c
++++ b/lib/fonts/font_mplus_1m_regular_12x17.c
 @@ -0,0 +1,4890 @@
 +/*
 + * 
@@ -9155,9 +9148,9 @@ diff -Naurp src.orig/lib/fonts/font_mplus_1m_regular_12x17.c src/lib/fonts/font_
 +	.pref	= 2,
 +};
 +EXPORT_SYMBOL(font_mplus_1m_regular_12x17);
-diff -Naurp src.orig/lib/fonts/font_mplus_1m_regular_16x22.c src/lib/fonts/font_mplus_1m_regular_16x22.c
---- src.orig/lib/fonts/font_mplus_1m_regular_16x22.c	1969-12-31 19:00:00.000000000 -0500
-+++ src/lib/fonts/font_mplus_1m_regular_16x22.c	2019-06-30 00:27:20.068658031 -0400
+diff -Naur a/lib/fonts/font_mplus_1m_regular_16x22.c b/lib/fonts/font_mplus_1m_regular_16x22.c
+--- a/lib/fonts/font_mplus_1m_regular_16x22.c
++++ b/lib/fonts/font_mplus_1m_regular_16x22.c
 @@ -0,0 +1,6170 @@
 +/*
 + * 
@@ -15329,9 +15322,9 @@ diff -Naurp src.orig/lib/fonts/font_mplus_1m_regular_16x22.c src/lib/fonts/font_
 +	.pref	= 2,
 +};
 +EXPORT_SYMBOL(font_mplus_1m_regular_16x22);
-diff -Naurp src.orig/lib/fonts/font_mplus_1m_regular_24x34.c src/lib/fonts/font_mplus_1m_regular_24x34.c
---- src.orig/lib/fonts/font_mplus_1m_regular_24x34.c	1969-12-31 19:00:00.000000000 -0500
-+++ src/lib/fonts/font_mplus_1m_regular_24x34.c	2019-06-30 00:27:21.008657249 -0400
+diff -Naur a/lib/fonts/font_mplus_1m_regular_24x34.c b/lib/fonts/font_mplus_1m_regular_24x34.c
+--- a/lib/fonts/font_mplus_1m_regular_24x34.c
++++ b/lib/fonts/font_mplus_1m_regular_24x34.c
 @@ -0,0 +1,9242 @@
 +/*
 + * 
@@ -24575,9 +24568,9 @@ diff -Naurp src.orig/lib/fonts/font_mplus_1m_regular_24x34.c src/lib/fonts/font_
 +	.pref	= 2,
 +};
 +EXPORT_SYMBOL(font_mplus_1m_regular_24x34);
-diff -Naurp src.orig/lib/fonts/font_mplus_1m_regular_32x44.c src/lib/fonts/font_mplus_1m_regular_32x44.c
---- src.orig/lib/fonts/font_mplus_1m_regular_32x44.c	1969-12-31 19:00:00.000000000 -0500
-+++ src/lib/fonts/font_mplus_1m_regular_32x44.c	2019-06-30 00:27:22.208656251 -0400
+diff -Naur a/lib/fonts/font_mplus_1m_regular_32x44.c b/lib/fonts/font_mplus_1m_regular_32x44.c
+--- a/lib/fonts/font_mplus_1m_regular_32x44.c
++++ b/lib/fonts/font_mplus_1m_regular_32x44.c
 @@ -0,0 +1,11802 @@
 +/*
 + * 
@@ -36381,9 +36374,9 @@ diff -Naurp src.orig/lib/fonts/font_mplus_1m_regular_32x44.c src/lib/fonts/font_
 +	.pref	= 2,
 +};
 +EXPORT_SYMBOL(font_mplus_1m_regular_32x44);
-diff -Naurp src.orig/lib/fonts/font_mplus_1m_regular_8x12.c src/lib/fonts/font_mplus_1m_regular_8x12.c
---- src.orig/lib/fonts/font_mplus_1m_regular_8x12.c	1969-12-31 19:00:00.000000000 -0500
-+++ src/lib/fonts/font_mplus_1m_regular_8x12.c	2019-06-30 00:27:18.104659663 -0400
+diff -Naur a/lib/fonts/font_mplus_1m_regular_8x12.c b/lib/fonts/font_mplus_1m_regular_8x12.c
+--- a/lib/fonts/font_mplus_1m_regular_8x12.c
++++ b/lib/fonts/font_mplus_1m_regular_8x12.c
 @@ -0,0 +1,3610 @@
 +/*
 + * 
@@ -39995,10 +39988,10 @@ diff -Naurp src.orig/lib/fonts/font_mplus_1m_regular_8x12.c src/lib/fonts/font_m
 +	.pref	= 2,
 +};
 +EXPORT_SYMBOL(font_mplus_1m_regular_8x12);
-diff -Naurp src.orig/lib/fonts/fonts.c src/lib/fonts/fonts.c
---- src.orig/lib/fonts/fonts.c	2019-06-24 23:36:02.000000000 -0400
-+++ src/lib/fonts/fonts.c	2019-06-30 00:30:37.804489624 -0400
-@@ -67,6 +67,30 @@ static const struct font_desc *fonts[] =
+diff -Naur a/lib/fonts/fonts.c b/lib/fonts/fonts.c
+--- a/lib/fonts/fonts.c
++++ b/lib/fonts/fonts.c
+@@ -67,6 +67,30 @@
  #undef NO_FONTS
      &font_6x10,
  #endif