[xorg-x11-drv-cirrus] cirrus-1.3.2-vgahw.patch: Adapt to new vgahw API
Adam Jackson
ajax at fedoraproject.org
Tue Nov 29 15:51:52 UTC 2011
commit 0b32dd55d90e3470610c2b23310e8b944bdc212a
Author: Adam Jackson <ajax at redhat.com>
Date: Tue Nov 29 15:50:50 2011 -0500
cirrus-1.3.2-vgahw.patch: Adapt to new vgahw API
cirrus-1.3.2-vgahw.patch | 22 ++++++++++++++++++++++
xorg-x11-drv-cirrus.spec | 7 ++++++-
2 files changed, 28 insertions(+), 1 deletions(-)
---
diff --git a/cirrus-1.3.2-vgahw.patch b/cirrus-1.3.2-vgahw.patch
new file mode 100644
index 0000000..74fae9a
--- /dev/null
+++ b/cirrus-1.3.2-vgahw.patch
@@ -0,0 +1,22 @@
+diff -up xf86-video-cirrus-1.3.2/src/alp_driver.c.jx xf86-video-cirrus-1.3.2/src/alp_driver.c
+--- xf86-video-cirrus-1.3.2/src/alp_driver.c.jx 2011-11-29 15:47:39.000000000 -0500
++++ xf86-video-cirrus-1.3.2/src/alp_driver.c 2011-11-29 15:49:48.043999760 -0500
+@@ -503,6 +503,7 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
+ if (!vgaHWGetHWRec(pScrn))
+ return FALSE;
+ hwp = VGAHWPTR(pScrn);
++ vgaHWSetStdFuncs(hwp);
+ vgaHWGetIOBase(hwp);
+
+ /* Allocate the AlpRec driverPrivate */
+diff -up xf86-video-cirrus-1.3.2/src/lg_driver.c.jx xf86-video-cirrus-1.3.2/src/lg_driver.c
+--- xf86-video-cirrus-1.3.2/src/lg_driver.c.jx 2011-11-29 15:47:39.000000000 -0500
++++ xf86-video-cirrus-1.3.2/src/lg_driver.c 2011-11-29 15:50:07.912996219 -0500
+@@ -364,6 +364,7 @@ LgPreInit(ScrnInfoPtr pScrn, int flags)
+ return FALSE;
+
+ hwp = VGAHWPTR(pScrn);
++ vgaHWSetStdFuncs(hwp);
+ vgaHWGetIOBase(hwp);
+
+ /* Allocate the LgRec driverPrivate */
diff --git a/xorg-x11-drv-cirrus.spec b/xorg-x11-drv-cirrus.spec
index 8f33939..03169db 100644
--- a/xorg-x11-drv-cirrus.spec
+++ b/xorg-x11-drv-cirrus.spec
@@ -5,7 +5,7 @@
Summary: Xorg X11 cirrus video driver
Name: xorg-x11-drv-cirrus
Version: 1.3.2
-Release: 12%{?dist}
+Release: 13%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X Hardware Support
@@ -17,6 +17,7 @@ Source1: cirrus.xinf
Patch0: cirrus-1.2.0-qemu.patch
Patch1: cirrus-1.3.2-git.patch
+Patch2: cirrus-1.3.2-vgahw.patch
BuildRequires: xorg-x11-server-sdk >= 1.10.99.902
BuildRequires: xorg-x11-util-macros >= 1.1.5
@@ -32,6 +33,7 @@ X.Org X11 cirrus video driver.
%setup -q -n %{tarball}-%{version}
%patch0 -p1 -b .qemu
%patch1 -p1 -b .git
+%patch2 -p1 -b .vgahw
%build
%configure --disable-static
@@ -61,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man4/cirrus.4*
%changelog
+* Tue Nov 29 2011 Adam Jackson <ajax at redhat.com> 1.3.2-13
+- cirrus-1.3.2-vgahw.patch: Adapt to new vgahw API
+
* Mon Nov 14 2011 Adam Jackson <ajax at redhat.com> - 1.3.2-12
- ABI rebuild
More information about the scm-commits
mailing list