Hello community, here is the log from the commit of package xf86-video-cirrus for openSUSE:Factory checked in at 2012-06-01 18:55:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xf86-video-cirrus (Old) and /work/SRC/openSUSE:Factory/.xf86-video-cirrus.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xf86-video-cirrus", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/xf86-video-cirrus/xf86-video-cirrus.changes 2012-05-25 16:20:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xf86-video-cirrus.new/xf86-video-cirrus.changes 2012-06-01 18:55:41.000000000 +0200 @@ -1,0 +2,15 @@ +Thu May 31 11:33:02 UTC 2012 - fcrozat@suse.com + +- Add u_cirrus-virt-16bpp.patch: Default to 16bpp in virt (Fedora) +- Add u_cirrus-qemu.patch: Remove the 10x7 heuristic, since the + server has equivalent code now. Instead, disable "acceleration" + under qemu, since taking the hypercall trap is really quite + expensive and you're better off doing noaccel. (Fedora) + +------------------------------------------------------------------- +Thu May 31 08:07:56 UTC 2012 - coolo@suse.com + +- do not install the driver on all machines having a cirrus card, + but only on those that also install a X server + +------------------------------------------------------------------- New: ---- u_cirrus-qemu.patch u_cirrus-virt-16bpp.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xf86-video-cirrus.spec ++++++ --- /var/tmp/diff_new_pack.seWYbA/_old 2012-06-01 18:55:46.000000000 +0200 +++ /var/tmp/diff_new_pack.seWYbA/_new 2012-06-01 18:55:46.000000000 +0200 @@ -24,6 +24,11 @@ Group: System/X11/Servers/XF86_4 Url: http://xorg.freedesktop.org/ 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 @@ -34,21 +39,20 @@ BuildRequires: pkgconfig(xorg-macros) >= 1.2 BuildRequires: pkgconfig(xorg-server) >= 1.4 BuildRequires: pkgconfig(xproto) -Supplements: xorg-x11-server # This was part of the xorg-x11-driver-video package up to version 7.6 Conflicts: xorg-x11-driver-video <= 7.6 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Supplements: modalias(pci:v00001013d000000D6sv*sd*bc*sc*i*) -Supplements: modalias(pci:v00001013d000000D4sv*sd*bc*sc*i*) -Supplements: modalias(pci:v00001013d000000D0sv*sd*bc*sc*i*) -Supplements: modalias(pci:v00001013d000000B8sv*sd*bc*sc*i*) -Supplements: modalias(pci:v00001013d000000BCsv*sd*bc*sc*i*) -Supplements: modalias(pci:v00001013d00000038sv*sd*bc*sc*i*) -Supplements: modalias(pci:v00001013d00001202sv*sd*bc*sc*i*) -Supplements: modalias(pci:v00001013d000000A0sv*sd*bc*sc*i*) -Supplements: modalias(pci:v00001013d000000A4sv*sd*bc*sc*i*) -Supplements: modalias(pci:v00001013d000000A8sv*sd*bc*sc*i*) -Supplements: modalias(pci:v00001013d000000ACsv*sd*bc*sc*i*) +Supplements: modalias(xorg-x11-server:pci:v00001013d000000D6sv*sd*bc*sc*i*) +Supplements: modalias(xorg-x11-server:pci:v00001013d000000D4sv*sd*bc*sc*i*) +Supplements: modalias(xorg-x11-server:pci:v00001013d000000D0sv*sd*bc*sc*i*) +Supplements: modalias(xorg-x11-server:pci:v00001013d000000B8sv*sd*bc*sc*i*) +Supplements: modalias(xorg-x11-server:pci:v00001013d000000BCsv*sd*bc*sc*i*) +Supplements: modalias(xorg-x11-server:pci:v00001013d00000038sv*sd*bc*sc*i*) +Supplements: modalias(xorg-x11-server:pci:v00001013d00001202sv*sd*bc*sc*i*) +Supplements: modalias(xorg-x11-server:pci:v00001013d000000A0sv*sd*bc*sc*i*) +Supplements: modalias(xorg-x11-server:pci:v00001013d000000A4sv*sd*bc*sc*i*) +Supplements: modalias(xorg-x11-server:pci:v00001013d000000A8sv*sd*bc*sc*i*) +Supplements: modalias(xorg-x11-server:pci:v00001013d000000ACsv*sd*bc*sc*i*) %x11_abi_videodrv_req %description @@ -56,6 +60,8 @@ %prep %setup -q +%patch0 -p1 +%patch1 -p1 %build %configure ++++++ u_cirrus-qemu.patch ++++++ diff -up xf86-video-cirrus-1.2.0/src/alp_driver.c.jx xf86-video-cirrus-1.2.0/src/alp_driver.c --- xf86-video-cirrus-1.2.0/src/alp_driver.c.jx 2008-03-19 10:29:23.000000000 -0400 +++ xf86-video-cirrus-1.2.0/src/alp_driver.c 2009-02-27 10:59:27.000000000 -0500 @@ -812,6 +812,12 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags) else xf86SetDDCproperties(pScrn,xf86PrintEDID( xf86DoEDID_DDC2(pScrn->scrnIndex,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); ++++++ u_cirrus-virt-16bpp.patch ++++++ 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 */ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org