[xorg-x11-drv-armsoc] Move to a git snapshot for the time being

[Peter Robinson]

commit 8eff06315e1c9886cc56e39cb743a73b1e028081
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sun Apr 21 21:16:34 2013 +0100

    Move to a git snapshot for the time being

 .gitignore                               |    2 +-
 sources                                  |    2 +-
 xorg-x11-drv-armsoc-0.5.1-mibstore.patch |   33 ----------------------
 xorg-x11-drv-armsoc-0.5.2-mibstore.patch |   44 ++++++++++++++++++++++++++++++
 xorg-x11-drv-armsoc.spec                 |   24 +++++++++-------
 5 files changed, 60 insertions(+), 45 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d48124b..7a281bc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/xorg-x11-drv-armsoc-0.5.1.tar.bz2
+/xorg-x11-drv-armsoc-*.tar.bz2
diff --git a/sources b/sources
index bcf454e..428f000 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9bc1d1878d7ce46b47c735359f1c1149  xorg-x11-drv-armsoc-0.5.1.tar.bz2
+409fb963ca294afa8217d40b183911d0  xorg-x11-drv-armsoc-0.5.2-02465b1.tar.bz2
diff --git a/xorg-x11-drv-armsoc-0.5.2-mibstore.patch b/xorg-x11-drv-armsoc-0.5.2-mibstore.patch
new file mode 100644
index 0000000..3153c1a
--- /dev/null
+++ b/xorg-x11-drv-armsoc-0.5.2-mibstore.patch
@@ -0,0 +1,44 @@
+--- xorg-x11-drv-armsoc-0.5.2/src/armsoc_driver.h.orig	2013-04-21 20:05:41.910984026 +0100
++++ xorg-x11-drv-armsoc-0.5.2/src/armsoc_driver.h	2013-04-21 20:06:17.742345818 +0100
+@@ -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"
+--- xorg-x11-drv-armsoc-0.5.2/src/drm_pl111_cursor.c.orig	2013-04-21 20:05:55.787124130 +0100
++++ xorg-x11-drv-armsoc-0.5.2/src/drm_pl111_cursor.c	2013-04-21 20:06:28.644455906 +0100
+@@ -46,9 +46,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.2/src/armsoc_driver.c.orig	2013-04-21 20:09:21.011196981 +0100
++++ xorg-x11-drv-armsoc-0.5.2/src/armsoc_driver.c	2013-04-21 20:09:39.690385720 +0100
+@@ -693,7 +693,6 @@
+ 	ARMSOCAccelInit(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.2/src/drmmode_display.c.orig	2013-04-21 20:53:42.235386485 +0100
++++ xorg-x11-drv-armsoc-0.5.2/src/drmmode_display.c	2013-04-21 20:53:55.863521018 +0100
+@@ -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"
diff --git a/xorg-x11-drv-armsoc.spec b/xorg-x11-drv-armsoc.spec
index b216a67..2c0d9c9 100644
--- a/xorg-x11-drv-armsoc.spec
+++ b/xorg-x11-drv-armsoc.spec
@@ -1,22 +1,22 @@
 # Tarfile created using git
 # git clone git://git.linaro.org/arm/xorg/driver/xf86-video-armsoc.git
-# git archive --format=tar --prefix=%{name}-%{version}/ %{version} | bzip2 > ~/%{name}-%{version}.tar.bz2
+# git archive --format=tar --prefix=%{name}-%{version}/ %{gittag} | bzip2 > ~/%{name}-%{version}-%{gittag}.tar.bz2
 
-%define tarfile %{name}-%{version}.tar.bz2
-%define gittag xf86-video-armsoc
+%define gittag 02465b1
+%define tarfile %{name}-%{version}-%{gittag}.tar.bz2
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir %{moduledir}/drivers
 
 Summary:   Xorg X11 armsocdrm driver
 Name:      xorg-x11-drv-armsoc
-Version:   0.5.1
-Release:   9%{?dist}
+Version:   0.5.2
+Release:   0.1.%{gittag}%{?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
+Patch0:    xorg-x11-drv-armsoc-0.5.2-mibstore.patch
 
 ExclusiveArch: %{arm}
 
@@ -28,7 +28,9 @@ BuildRequires: libXrandr-devel
 BuildRequires: libXv-devel
 BuildRequires: mesa-libGL-devel
 BuildRequires: xorg-x11-server-devel
+BuildRequires: xorg-x11-util-macros
 BuildRequires: autoconf automake libtool
+BuildRequires: perl-Carp
 
 Requires:  xorg-x11-server-Xorg
 
@@ -38,12 +40,11 @@ Exynos 4/5 series ARM devices.
 
 %prep
 %setup -q
-%patch0 -p1
+%patch0 -p1 -b .mibstore
 
 %build
-sh autogen.sh
-#autoreconf -v --install || exit 1
-%configure --disable-static  --libdir=%{_libdir} --mandir=%{_mandir}
+sh autogen.sh --with-drmmode=exynos
+%configure --disable-static  --libdir=%{_libdir} --mandir=%{_mandir} --with-drmmode=exynos
 make V=1
 
 %install
@@ -59,6 +60,9 @@ find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 %{_mandir}/man4/armsoc.4*
 
 %changelog
+* Sun Apr 21 2013 Peter Robinson <pbrobinson at fedoraproject.org> 0.5.2-0.1-02465b1
+- Move to a git snapshot for the time being
+
 * Thu Apr 04 2013 Dennis Gilmore <dennis at ausil.us> - 0.5.1-9
 - patch to fix ftbfs bz#948089