summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnas Nashif <anas.nashif@intel.com>2012-11-15 23:55:02 (GMT)
committerAnas Nashif <anas.nashif@intel.com>2012-11-15 23:55:02 (GMT)
commit6401a1026efcecf430abff6c06875c48818d7012 (patch)
tree1c5d0a078b341cc7f3db00e12da96eb9b2a3ed7e
parent1537601c4fe09c3ebf8029b886a8008fabbdca0f (diff)
downloadxf86-video-cirrus-6401a1026efcecf430abff6c06875c48818d7012.zip
xf86-video-cirrus-6401a1026efcecf430abff6c06875c48818d7012.tar.gz
xf86-video-cirrus-6401a1026efcecf430abff6c06875c48818d7012.tar.bz2
-rw-r--r--packaging/u_cirrus-qemu.patch16
-rw-r--r--packaging/u_cirrus-virt-16bpp.patch31
-rw-r--r--packaging/xf86-video-cirrus.spec9
3 files changed, 0 insertions, 56 deletions
diff --git a/packaging/u_cirrus-qemu.patch b/packaging/u_cirrus-qemu.patch
deleted file mode 100644
index 906937b..0000000
--- a/packaging/u_cirrus-qemu.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- xf86-video-cirrus-1.5.1/src/alp_driver.c.orig 2012-09-14 14:02:24.477314000 +0200
-+++ xf86-video-cirrus-1.5.1/src/alp_driver.c 2012-09-14 14:02:28.610956000 +0200
-@@ -775,6 +775,13 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
- else
- xf86SetDDCproperties(pScrn,xf86PrintEDID(
- xf86DoEDID_DDC2(XF86_SCRN_ARG(pScrn),pCir->I2CPtr1)));
-+
-+#ifdef XSERVER_LIBPCIACCESS
-+ if (!pScrn->monitor->DDC &&
-+ ((pCir->PciInfo->subvendor_id & 0xffff) == 0x1af4)) {
-+ pCir->NoAccel = TRUE;
-+ }
-+#endif
-
- /* Probe the possible LCD display */
- AlpProbeLCD(pScrn);
diff --git a/packaging/u_cirrus-virt-16bpp.patch b/packaging/u_cirrus-virt-16bpp.patch
deleted file mode 100644
index 11ea3e5..0000000
--- a/packaging/u_cirrus-virt-16bpp.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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 2012-04-02 16:30:29.000000000 -0400
-+++ xf86-video-cirrus-1.3.2/src/alp_driver.c 2012-04-02 16:33:11.668580522 -0400
-@@ -476,6 +476,7 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
- vgaHWPtr hwp;
- MessageType from, from1;
- int i;
-+ int defaultdepth;
- int depth_flags;
- ClockRangePtr clockRanges;
- char *s;
-@@ -557,11 +558,18 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
- depth_flags |= Support32bppFb |
- SupportConvert32to24 |
- PreferConvert32to24;
-+
-+ /* use 16bpp in virt */
-+ if ((pCir->PciInfo->subvendor_id & 0xffff) == 0x1af4)
-+ defaultdepth = 16;
-+ else
-+ defaultdepth = 24;
-+
- /*
- * The first thing we should figure out is the depth, bpp, etc.
- * We support both 24bpp and 32bpp layouts, so indicate that.
- */
-- if (!xf86SetDepthBpp(pScrn, 0, 0, 24, depth_flags)) {
-+ if (!xf86SetDepthBpp(pScrn, 0, 0, defaultdepth, depth_flags)) {
- return FALSE;
- } else {
- /* Check that the returned depth is one we support */
diff --git a/packaging/xf86-video-cirrus.spec b/packaging/xf86-video-cirrus.spec
index 8a6e57a..86407a5 100644
--- a/packaging/xf86-video-cirrus.spec
+++ b/packaging/xf86-video-cirrus.spec
@@ -6,11 +6,6 @@ Summary: Cirrus Logic video driver for the Xorg X server
Url: http://xorg.freedesktop.org/
Group: System/X11/Servers/XF86_4
Source0: http://xorg.freedesktop.org/releases/individual/driver/%{name}-%{version}.tar.bz2
-# PATCH-FIX-UPSTREAM cirrus-1.2.0-qemu.patch fcrozat@suse.com -- Avoid 10x7 heuristic, handled by server (Fedora)
-Patch0: u_cirrus-qemu.patch
-# PATCH-FIX-UPSTREAM cirrus-1.3.2-virt-16bpp.patch fcrozat@suse.com -- Use 16bpp when running in virt (Fedora)
-Patch1: u_cirrus-virt-16bpp.patch
-
BuildRequires: pkg-config
BuildRequires: pkgconfig(fontsproto)
BuildRequires: pkgconfig(pciaccess) >= 0.8.0
@@ -33,16 +28,12 @@ Supplements: modalias(xorg-server:pci:v00001013d000000D0sv*sd*bc*sc*i*)
Supplements: modalias(xorg-server:pci:v00001013d000000D4sv*sd*bc*sc*i*)
Supplements: modalias(xorg-server:pci:v00001013d000000D6sv*sd*bc*sc*i*)
Supplements: modalias(xorg-server:pci:v00001013d00001202sv*sd*bc*sc*i*)
-# This was part of the xorg-x11-driver-video package up to version 7.6
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
cirrus is an Xorg driver for Cirrus Logic video cards.
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
%build
%configure