From 138f56c9a27f9e25a4faa730a4557e7bbf8a165f Mon Sep 17 00:00:00 2001
From: Bdale Garbee <bdale@gag.com>
Date: Wed, 4 Aug 2021 01:38:22 -0600
Subject: [PATCH] pull in fixes for gcc-10 compilation

---
 debian/changelog                     |  6 ++++++
 debian/patches/fixes-for-gcc-10.diff | 21 +++++++++++++++++++++
 debian/patches/series                |  1 +
 3 files changed, 28 insertions(+)
 create mode 100644 debian/patches/fixes-for-gcc-10.diff

diff --git a/debian/changelog b/debian/changelog
index 1e1b1eae..641663dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+altos (1.9.7-2) unstable; urgency=medium
+
+  * pull in fix from master branch for gcc-10 compilation, closes: #991800
+
+ -- Bdale Garbee <bdale@gag.com>  Tue, 03 Aug 2021 09:44:09 -0600
+
 altos (1.9.7-1) unstable; urgency=medium
 
   [ Keith Packard ]
diff --git a/debian/patches/fixes-for-gcc-10.diff b/debian/patches/fixes-for-gcc-10.diff
new file mode 100644
index 00000000..ad2f3752
--- /dev/null
+++ b/debian/patches/fixes-for-gcc-10.diff
@@ -0,0 +1,21 @@
+--- altos-1.9.7.orig/src/lpc/lpc.h
++++ altos-1.9.7/src/lpc/lpc.h
+@@ -868,7 +868,7 @@ struct lpc_usb {
+ 	vuint32_t	introuting;
+ 	uint32_t	r30;
+ 	vuint32_t	eptoggle;
+-} lpc_usb;
++};
+ 
+ extern struct lpc_usb lpc_usb;
+ #define lpc_usb (*(struct lpc_usb *) 0x40080000)
+--- altos-1.9.7.orig/src/micropeak-v2.0/ao_micro.c
++++ altos-1.9.7/src/micropeak-v2.0/ao_micro.c
+@@ -23,7 +23,6 @@
+ #include <ao_report_micro.h>
+ #include <ao_log_micro.h>
+ 
+-uint32_t 	pa;
+ alt_t		ground_alt, max_alt;
+ alt_t		ao_max_height;
+ 
diff --git a/debian/patches/series b/debian/patches/series
index e69de29b..77c163c2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fixes-for-gcc-10.diff
-- 
2.30.2