u8g2: add Makefile.version, update version

Update to a newer version that includes the fixes for include
re-ordering.

Author: bradjc

u8g2/Makefile

@@ -1,11 +1,10 @@
-# Git hash of the library to use
-VERSION_HASH := c4f9cd9f8717661c46be16bfbcb0017d785db3c1
+include Makefile.version
 
 # Base folder definitions
 TOCK_USERLAND_BASE_DIR ?= ..
 LIBNAME := u8g2
 $(LIBNAME)_DIR := $(TOCK_USERLAND_BASE_DIR)/$(LIBNAME)
-LIB_SRC_DIR := $($(LIBNAME)_DIR)/u8g2-$(VERSION_HASH)
+LIB_SRC_DIR := $($(LIBNAME)_DIR)/u8g2-$(U8G2_VERSION_HASH)
 
 # List all C and Assembly files
 $(LIBNAME)_SRCS_ALL  += $(wildcard $(LIB_SRC_DIR)/csrc/u8g2*.c)

u8g2/Makefile.app

@@ -1,5 +1,5 @@
-# Git hash of the library to use. Must match the hash in Makefile.
-U8G2_VERSION_HASH := c4f9cd9f8717661c46be16bfbcb0017d785db3c1
+# Git hash of the library to use. Must match the hash in Makefile.version.
+U8G2_VERSION_HASH := bde09fbf787892c79a184e88b124aa5c79393aed
 
 # Base folder definitions
 U8G2_LIB_DIR := $(TOCK_USERLAND_BASE_DIR)/u8g2

u8g2/Makefile.setup

@@ -2,23 +2,16 @@
 ### Helper Makefile for downloading the U8G2 library and unzipping.
 ###
 
-TOCK_USERLAND_BASE_DIR ?= ..
-
-# Git hash of the library to use. Must match the hash in Makefile.
-U8G2_VERSION_HASH := c4f9cd9f8717661c46be16bfbcb0017d785db3c1
-
-# Base folder definitions
-U8G2_LIB_DIR := $(TOCK_USERLAND_BASE_DIR)/u8g2
-U8G2_SRC_DIR := $(U8G2_LIB_DIR)/u8g2-$(U8G2_VERSION_HASH)
+include Makefile.version
 
 # Rules to download the source repository if needed. These are here so that the
 # expanded library is available before calling into the library Makefile.
 $(U8G2_SRC_DIR).zip:
 	curl -L --output $(U8G2_SRC_DIR).zip https://codeload.github.com/olikraus/u8g2/zip/$(U8G2_VERSION_HASH)
 
 # The .h file will exist when the library is unzipped.
-$(U8G2_SRC_DIR)/csrc/u8g2.h: | $(U8G2_SRC_DIR).zip
+$(U8G2_SENTINEL_FILE): | $(U8G2_SRC_DIR).zip
 	unzip -q -d $(U8G2_LIB_DIR) $(U8G2_SRC_DIR).zip
 
 # Main rule to check if we need to fetch the library.
-all: | $(U8G2_SRC_DIR)/csrc/u8g2.h
+all: | $(U8G2_SENTINEL_FILE)

u8g2/Makefile.version

@@ -0,0 +1,15 @@
+###
+### Helper Makefile for the version of the library.
+###
+
+TOCK_USERLAND_BASE_DIR ?= ..
+
+# Git hash of the library to use. Must match the hash in Makefile.
+U8G2_VERSION_HASH := bde09fbf787892c79a184e88b124aa5c79393aed
+
+# Base folder definitions
+U8G2_LIB_DIR := $(TOCK_USERLAND_BASE_DIR)/u8g2
+U8G2_SRC_DIR := $(U8G2_LIB_DIR)/u8g2-$(U8G2_VERSION_HASH)
+
+# The file we use to determine if the library has been fetched and built.
+U8G2_SENTINEL_FILE := $(U8G2_SRC_DIR)/csrc/u8g2.h