diff -Nru xf86-video-omap-0.4.5/debian/changelog xf86-video-omap-0.4.5/debian/changelog
--- xf86-video-omap-0.4.5/debian/changelog	2018-08-19 20:23:07.000000000 +0000
+++ xf86-video-omap-0.4.5/debian/changelog	2020-05-15 10:24:48.000000000 +0000
@@ -1,14 +1,9 @@
-xf86-video-omap (0.4.5-1build2) cosmic; urgency=medium
+xf86-video-omap (0.4.5-1.1) unstable; urgency=low
 
-  * Rebuild against new xserver.
+  * Non-maintainer upload.
+  * Fix a NULL dereference found by gcc 9. (Closes: #956886)
 
- -- Gianfranco Costamagna <locutusofborg@debian.org>  Sun, 19 Aug 2018 22:23:07 +0200
-
-xf86-video-omap (0.4.5-1build1) zesty; urgency=medium
-
-  * Rebuild against the new xserver.
-
- -- Timo Aaltonen <tjaalton@debian.org>  Tue, 04 Apr 2017 00:34:25 +0300
+ -- Adrian Bunk <bunk@debian.org>  Fri, 15 May 2020 13:24:48 +0300
 
 xf86-video-omap (0.4.5-1) unstable; urgency=medium
 
diff -Nru xf86-video-omap-0.4.5/debian/patches/null-dereference.patch xf86-video-omap-0.4.5/debian/patches/null-dereference.patch
--- xf86-video-omap-0.4.5/debian/patches/null-dereference.patch	1970-01-01 00:00:00.000000000 +0000
+++ xf86-video-omap-0.4.5/debian/patches/null-dereference.patch	2020-05-15 10:24:48.000000000 +0000
@@ -0,0 +1,15 @@
+Description: Fix a NULL dereference found by gcc 9
+Author: Adrian Bunk <bunk@debian.org>
+Bug-Debian: https://bugs.debian.org/956886
+
+--- xf86-video-omap-0.4.5.orig/src/omap_driver.c
++++ xf86-video-omap-0.4.5/src/omap_driver.c
+@@ -542,7 +542,7 @@ OMAPPreInit(ScrnInfoPtr pScrn, int flags
+ 	}
+ 
+ 	if (!pScrn->chipset) {
+-		ERROR_MSG("Unknown chipset: %s", pScrn->chipset);
++		ERROR_MSG("Unknown chipset");
+ 		goto fail;
+ 	}
+ 
diff -Nru xf86-video-omap-0.4.5/debian/patches/series xf86-video-omap-0.4.5/debian/patches/series
--- xf86-video-omap-0.4.5/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ xf86-video-omap-0.4.5/debian/patches/series	2020-05-15 10:24:35.000000000 +0000
@@ -0,0 +1 @@
+null-dereference.patch