[xorg-x11-drv-armsoc] patch to fix ftbfs bz#948089

Dennis Gilmore ausil at fedoraproject.org
Fri Apr 5 03:16:29 UTC 2013


commit d68e9c21f7390606bdbc301f1dcf9b09e4bc5d5d
Author: Dennis Gilmore <dennis at ausil.us>
Date:   Thu Apr 4 22:16:27 2013 -0500

    patch to fix ftbfs bz#948089

 xorg-x11-drv-armsoc-0.5.1-mibstore.patch |   33 ++++++++++++++++++++++++++++++
 xorg-x11-drv-armsoc.spec                 |    7 +++++-
 2 files changed, 39 insertions(+), 1 deletions(-)
---
diff --git a/xorg-x11-drv-armsoc-0.5.1-mibstore.patch b/xorg-x11-drv-armsoc-0.5.1-mibstore.patch
new file mode 100644
index 0000000..3de295c
--- /dev/null
+++ b/xorg-x11-drv-armsoc-0.5.1-mibstore.patch
@@ -0,0 +1,33 @@
+--- xorg-x11-drv-armsoc-0.5.1/src/drmmode_display.c.arm	2012-10-04 05:52:46.000000000 -0400
++++ xorg-x11-drv-armsoc-0.5.1/src/drmmode_display.c	2013-04-04 13:56:38.930929602 -0400
+@@ -52,9 +52,6 @@ 
+ #include "compiler.h"
+ #include "mipointer.h"
+ 
+-/* All drivers implementing backing store need this */
+-#include "mibstore.h"
+-
+ #include "micmap.h"
+ 
+ #include "xf86DDC.h"
+--- xorg-x11-drv-armsoc-0.5.1/src/omap_driver.c.arm	2012-10-04 05:52:46.000000000 -0400
++++ xorg-x11-drv-armsoc-0.5.1/src/omap_driver.c	2013-04-04 13:55:22.620252388 -0400
+@@ -770,7 +770,6 @@ OMAPScreenInit(SCREEN_INIT_ARGS_DECL)
+ 	OMAPAccelInit(pScreen);
+ 
+ 	/* Initialize backing store: */
+-	miInitializeBackingStore(pScreen);
+ 	xf86SetBackingStore(pScreen);
+ 
+ 	/* Cause the cursor position to be updated by the mouse signal handler: */
+--- xorg-x11-drv-armsoc-0.5.1/src/omap_driver.h.arm	2012-10-04 05:52:46.000000000 -0400
++++ xorg-x11-drv-armsoc-0.5.1/src/omap_driver.h	2013-04-04 13:56:57.433515495 -0400
+@@ -40,7 +40,6 @@ 
+  * XXX - figure out what can be removed..
+  */
+ #include "mipointer.h"
+-#include "mibstore.h"
+ #include "micmap.h"
+ #include "colormapst.h"
+ #include "xf86cmap.h"
+
diff --git a/xorg-x11-drv-armsoc.spec b/xorg-x11-drv-armsoc.spec
index 9cbff15..b216a67 100644
--- a/xorg-x11-drv-armsoc.spec
+++ b/xorg-x11-drv-armsoc.spec
@@ -10,12 +10,13 @@
 Summary:   Xorg X11 armsocdrm driver
 Name:      xorg-x11-drv-armsoc
 Version:   0.5.1
-Release:   8%{?dist}
+Release:   9%{?dist}
 URL:       http://git.linaro.org/gitweb?p=arm/xorg/driver/xf86-video-armsoc.git
 License:   MIT
 Group:     User Interface/X Hardware Support
 
 Source0:   %{tarfile}
+Patch0:    xorg-x11-drv-armsoc-0.5.1-mibstore.patch
 
 ExclusiveArch: %{arm}
 
@@ -37,6 +38,7 @@ Exynos 4/5 series ARM devices.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 sh autogen.sh
@@ -57,6 +59,9 @@ find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 %{_mandir}/man4/armsoc.4*
 
 %changelog
+* Thu Apr 04 2013 Dennis Gilmore <dennis at ausil.us> - 0.5.1-9
+- patch to fix ftbfs bz#948089
+
 * Thu Mar 07 2013 Peter Hutterer <peter.hutterer at redhat.com> - 0.5.1-8
 - ABI rebuild
 


More information about the scm-commits mailing list