[xorg-x11-drv-mga] Update to git snapshot mga-1.4.6.1-get-client-pointer.patch: drop, file removed upstream add hack to

[Peter Hutterer]

commit 9f5519de808e9819cd1defbf04f5912ad37f0ec4
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Wed Jan 4 15:17:46 2012 +1000

    Update to git snapshot
    mga-1.4.6.1-get-client-pointer.patch: drop, file removed upstream
    add hack to build with --disable-dri
    amazingly, mga(4) now resides in man4.

 .gitignore                 |    1 +
 commitid                   |    1 +
 make-git-snapshot.sh       |   18 ++++++++++++++++++
 mga-1.4.12-bigendian.patch |   12 ------------
 sources                    |    2 +-
 xorg-x11-drv-mga.spec      |   26 +++++++++++++++++++-------
 6 files changed, 40 insertions(+), 20 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e070f92..e962bf8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 xf86-video-mga-1.4.11.tar.bz2
 xf86-video-mga-1.4.13.tar.bz2
+/xf86-video-mga-20120104.tar.bz2
diff --git a/commitid b/commitid
new file mode 100644
index 0000000..8e30db3
--- /dev/null
+++ b/commitid
@@ -0,0 +1 @@
+9223c44a731f48c66c226eb88dcb6f9d574cb599
diff --git a/make-git-snapshot.sh b/make-git-snapshot.sh
new file mode 100755
index 0000000..cbb0f0d
--- /dev/null
+++ b/make-git-snapshot.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+MODULE=xf86-video-mga
+DIRNAME=$MODULE-$( date +%Y%m%d )
+
+rm -rf $DIRNAME
+git clone git://git.freedesktop.org/git/xorg/driver/$MODULE $DIRNAME
+cd $DIRNAME
+if [ -z "$1" ]; then
+    git log | head -1
+else
+    git checkout $1
+fi
+git log | head -1 | awk '{ print $2 }' > ../commitid
+git repack -a -d
+cd ..
+tar jcf $DIRNAME.tar.bz2 $DIRNAME
+rm -rf $DIRNAME
diff --git a/mga-1.4.12-bigendian.patch b/mga-1.4.12-bigendian.patch
index 49359ea..3e556ea 100644
--- a/mga-1.4.12-bigendian.patch
+++ b/mga-1.4.12-bigendian.patch
@@ -15,18 +15,6 @@ diff -up xf86-video-mga-1.4.12/src/mga_dri.c.jx xf86-video-mga-1.4.12/src/mga_dr
        OUTREG( MGAREG_CXBNDRY, 0xFFFF0000 ); /* (maxX << 16) | minX */
        OUTREG( MGAREG_YTOP, 0x00000000 );    /* minPixelPointer */
        OUTREG( MGAREG_YBOT, 0x007FFFFF );    /* maxPixelPointer */
-diff -up xf86-video-mga-1.4.12/src/mga_driver.c.jx xf86-video-mga-1.4.12/src/mga_driver.c
---- xf86-video-mga-1.4.12/src/mga_driver.c.jx	2011-06-20 11:57:31.000000000 -0400
-+++ xf86-video-mga-1.4.12/src/mga_driver.c	2011-06-20 12:11:51.713070025 -0400
-@@ -2536,7 +2536,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
- 	/*if (pMga->Chipset == PCI_CHIP_MGAG200 ||
- 	  pMga->Chipset == PCI_CHIP_MGAG200_PCI) */{
- 	    CARD32 opmode;
--	    opmode = INREG(MGAREG_OPMODE);
-+	    opmode = INREG(MGAREG_OPMODE) & ~MGAOPM_DMA_MASK ;
- 	    OUTREG(MGAREG_OPMODE,  MGAOPM_DMA_BLIT | opmode);
- 	}
- 	/* wrapping OpenLibrary to fix broken registers. MATROX: hint, hint. */
 diff -up xf86-video-mga-1.4.12/src/mga_exa.c.jx xf86-video-mga-1.4.12/src/mga_exa.c
 --- xf86-video-mga-1.4.12/src/mga_exa.c.jx	2009-04-27 11:47:42.000000000 -0400
 +++ xf86-video-mga-1.4.12/src/mga_exa.c	2011-06-20 12:08:14.368304719 -0400
diff --git a/sources b/sources
index 4c24670..daf5c29 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f967fb3e655f6f68aa3f495eaadcaac2  xf86-video-mga-1.4.13.tar.bz2
+13ba37132d7aa6ba693b35ec73ee6fe6  xf86-video-mga-20120104.tar.bz2
diff --git a/xorg-x11-drv-mga.spec b/xorg-x11-drv-mga.spec
index d0a1de4..095de8f 100644
--- a/xorg-x11-drv-mga.spec
+++ b/xorg-x11-drv-mga.spec
@@ -2,22 +2,28 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
 
-%define gitdate 20080102
+%global gitdate 20120104
+%global gitversion 9223c44a7
 
 Summary:   Xorg X11 mga video driver
 Name:      xorg-x11-drv-mga
 Version:   1.4.13
-Release:   14%{?dist}
+Release:   15%{?gitdate:.%{gitdate}git%{gitversion}}%{dist}
 URL:       http://www.x.org
 License: MIT
 Group:     User Interface/X Hardware Support
 
+%if 0%{?gitdate}
+Source0:    %{tarball}-%{gitdate}.tar.bz2
+Source1:    make-git-snapshot.sh
+Source2:    commitid
+%else
 Source0:   http://x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
-#Source0:    %{tarball}-%{gitdate}.tar.bz2
+%endif
 
 Patch0: mga-1.4.5-no-hal-advertising.patch
-Patch1: mga-1.4.6.1-get-client-pointer.patch
 Patch2: mga-1.4.12-bigendian.patch
+Patch3: 0001-Untangle-XF86DRI-from-the-driver-specific-DRI-define.patch
 
 ExcludeArch: s390 s390x
 
@@ -33,10 +39,10 @@ Requires: Xorg %(xserver-sdk-abi-requires videodrv)
 X.Org X11 mga video driver.
 
 %prep
-%setup -q -n %{tarball}-%{version}
+%setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
 %patch0 -p1 -b .hal
-%patch1 -p1 -b .gcp
 %patch2 -p1 -b .bigendian
+%patch3 -p1 -b .disable-dri
 
 %build
 autoreconf -v --install || exit 1
@@ -56,9 +62,15 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %{driverdir}/mga_drv.so
-%{_mandir}/man5/mga.4*
+%{_mandir}/man4/mga.4*
 
 %changelog
+* Wed Jan 04 2012 Peter Hutterer <peter.hutterer at redhat.com> 1.4.13-15.20120104git9223c44a7
+- Update to git snapshot
+- mga-1.4.6.1-get-client-pointer.patch: drop, file removed upstream
+- add hack to build with --disable-dri
+- amazingly, mga(4) now resides in man4.
+
 * Wed Jan 04 2012 Peter Hutterer <peter.hutterer at redhat.com> - 1.4.13-14
 - Rebuild for server 1.12