From fb9051e38ba5c2b15f9507ec881812be4484dacb Mon Sep 17 00:00:00 2001
From: NiLuJe <ninuje@gmail.com>
Date: Mon, 30 Nov 2020 18:26:01 +0100
Subject: [PATCH 1/2] Allow building Kobo binaries in debug mode

---
 Makefile | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index c87e87a..ea582e9 100644
--- a/Makefile
+++ b/Makefile
@@ -3,9 +3,9 @@ GITHASH='"'$(shell git rev-parse --short HEAD)'"'
 CROSS_TC?=/home/llandsmeer/Build/gcc-linaro-7.5.0-2019.12-i686_arm-linux-gnueabihf/bin/arm-linux-gnueabihf
 # CROSS_TC?=arm-linux-gnueabihf
 
-ifeq ("$(DEBUG)","true")
-	CFLAGS   += -g -pg
-	CXXFLAGS += -g -pg
+ifdef DEBUG
+	CFLAGS   += -g -fno-omit-frame-pointer -pg
+	CXXFLAGS += -g -fno-omit-frame-pointer -pg
 else
 	CFLAGS   ?= -O2
 	CXXFLAGS ?= -O2
@@ -73,7 +73,7 @@ linux: build/libfbink.a build/libvterm.a src/_kbsend.hpp
 	python3 keymap.py > src/_keymap.hpp
 	python3 src/kblayout.py > src/_kblayout.hpp
 	g++ $(CPPFLAGS) $(CXXFLAGS) $(EXTRA_WARNINGS) src/main.cpp -lvterm -lfbink -o build/inkvt.host $(LDFLAGS)
-ifneq ("$(DEBUG)","true")
+ifndef DEBUG
 	strip --strip-unneeded build/inkvt.host
 endif
 
@@ -81,8 +81,10 @@ kobo: build/fbdepth build/libfbink_kobo.a build/libvterm_kobo.a src/_kbsend.hpp
 	python3 keymap.py > src/_keymap.hpp
 	python3 src/kblayout.py > src/_kblayout.hpp
 	$(CROSS_TC)-g++ -DTARGET_KOBO $(CPPFLAGS) $(CXXFLAGS) $(EXTRA_WARNINGS) src/main.cpp -lvterm_kobo -lfbink_kobo -o build/inkvt.armhf $(LDFLAGS) $(STATIC_STL_FLAG)
+ifndef DEBUG
 	$(CROSS_TC)-strip --strip-unneeded build/inkvt.armhf
 	upx build/inkvt.armhf || echo "install UPX for smaller executables"
+endif
 
 release: clean kobo
 	mkdir -p Kobo/.adds/inkvt Kobo/.adds/kfmon/config
@@ -106,19 +108,31 @@ build/libfbink.a:
 	mkdir -p build
 	make -C FBInk clean || (echo "TRY git submodule update --init --recursive"  && false)
 	env -u CROSS_TC -u CPPFLAGS -u CFLAGS -u CXXFLAGS -u LDFLAGS -u AR -u RANLIB make -C FBInk LINUX=true MINIMAL=true FONTS=true IMAGE=true staticlib
+ifdef DEBUG
+	cp FBInk/Debug/libfbink.a build/libfbink.a
+else
 	cp FBInk/Release/libfbink.a build/libfbink.a
+endif
 
 build/libfbink_kobo.a:
 	mkdir -p build
 	make -C FBInk clean
 	make -C FBInk CROSS_TC=$(CROSS_TC) KOBO=true MINIMAL=true FONTS=true IMAGE=true staticlib
+ifdef DEBUG
+	cp FBInk/Debug/libfbink.a build/libfbink_kobo.a
+else
 	cp FBInk/Release/libfbink.a build/libfbink_kobo.a
+endif
 
 build/fbdepth:
 	mkdir -p build
 	make -C FBInk clean
 	make -C FBInk CROSS_TC=$(CROSS_TC) KOBO=true utils
+ifdef DEBUG
+	cp FBInk/Debug/fbdepth build/fbdepth
+else
 	cp FBInk/Release/fbdepth build/fbdepth
+endif
 
 clean:
 	make -C FBInk clean  || (echo "TRY git submodule update --init --recursive"  && false)

From ebd8aa5fd6fc254ecf3153be8c220b7b0d6bdd88 Mon Sep 17 00:00:00 2001
From: NiLuJe <ninuje@gmail.com>
Date: Mon, 30 Nov 2020 18:26:52 +0100
Subject: [PATCH 2/2] Update to FBInk 1.23.0

---
 FBInk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FBInk b/FBInk
index 8350bbb..870faed 160000
--- a/FBInk
+++ b/FBInk
@@ -1 +1 @@
-Subproject commit 8350bbb0e45585d9bbff1a9bb9dcb1d7c890fe1b
+Subproject commit 870faed5712417b74ef54f24e0dc5bd3222ef625