From edb6d49b3c86c457419c0cb25e5314107cf4933a Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@fedoraproject.org>
Date: Aug 04 2009 05:28:08 +0000
Subject: - vesa 2.2.1


---

diff --git a/.cvsignore b/.cvsignore
index 416ba46..9aada77 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-xf86-video-vesa-2.2.0.tar.bz2
+xf86-video-vesa-2.2.1.tar.bz2
diff --git a/sources b/sources
index 55c623f..35ce16e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9a86b683f73f3806f55d05cd804a6f4a  xf86-video-vesa-2.2.0.tar.bz2
+61a1dc9a22991bd04d0ff98f800775c1  xf86-video-vesa-2.2.1.tar.bz2
diff --git a/vesa-2.2.0-panelid.patch b/vesa-2.2.0-panelid.patch
deleted file mode 100644
index 3a0f09e..0000000
--- a/vesa-2.2.0-panelid.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -up xf86-video-vesa-2.2.0/src/vesa.c.jx xf86-video-vesa-2.2.0/src/vesa.c
---- xf86-video-vesa-2.2.0/src/vesa.c.jx	2009-02-05 16:15:07.000000000 -0500
-+++ xf86-video-vesa-2.2.0/src/vesa.c	2009-02-20 17:39:49.000000000 -0500
-@@ -671,6 +671,11 @@ VESAPreInit(ScrnInfoPtr pScrn, int flags
- 
-     if ((pScrn->monitor->DDC = pVesa->monitor) != NULL)
- 	xf86SetDDCproperties(pScrn, pVesa->monitor);
-+    else {
-+        void *panelid = VBEReadPanelID(pVesa->pVbe);
-+        VBEInterpretPanelID(pScrn->scrnIndex, panelid);
-+        xfree(panelid);
-+    }
- 
-     xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, DEBUG_VERB,
- 			"Searching for matching VESA mode(s):\n");
diff --git a/xorg-x11-drv-vesa.spec b/xorg-x11-drv-vesa.spec
index a8ef030..cf2d2c2 100644
--- a/xorg-x11-drv-vesa.spec
+++ b/xorg-x11-drv-vesa.spec
@@ -4,16 +4,14 @@
 
 Summary:   Xorg X11 vesa video driver
 Name:      xorg-x11-drv-vesa
-Version:   2.2.0
-Release:   4%{?dist}.1
+Version:   2.2.1
+Release:   1%{?dist}
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License: MIT
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch0: vesa-2.2.0-panelid.patch
-
 ExcludeArch: s390 s390x
 
 BuildRequires: xorg-x11-server-sdk >= 1.4.99.1-0.15
@@ -26,7 +24,6 @@ X.Org X11 vesa video driver.
 
 %prep
 %setup -q -n %{tarball}-%{version}
-%patch0 -p1 -b .panelid
 
 %build
 #autoreconf -v --install || exit 1
@@ -51,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/vesa.4*
 
 %changelog
+* Tue Aug 04 2009 Dave Airlie <airlied@redhat.com> 2.2.1-1
+- vesa 2.2.1
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.0-4.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild