Hello community, here is the log from the commit of package xf86-video-qxl for openSUSE:Factory checked in at 2014-09-01 16:58:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xf86-video-qxl (Old) and /work/SRC/openSUSE:Factory/.xf86-video-qxl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xf86-video-qxl" Changes: -------- --- /work/SRC/openSUSE:Factory/xf86-video-qxl/xf86-video-qxl.changes 2014-08-01 14:34:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xf86-video-qxl.new/xf86-video-qxl.changes 2014-09-01 16:58:58.000000000 +0200 @@ -1,0 +2,12 @@ +Fri Aug 29 13:02:23 CEST 2014 - [email protected] + +- n_disable-surfaces-on-kms.patch + Disable the broken offscreen surfaces on KMS (bnc#894022) + +------------------------------------------------------------------- +Mon Aug 25 11:37:22 UTC 2014 - [email protected] + +- Build Xspice X server and driver (on openSUSE 12.3 and later), + ship them a separate subpackage. + +------------------------------------------------------------------- New: ---- n_disable-surfaces-on-kms.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xf86-video-qxl.spec ++++++ --- /var/tmp/diff_new_pack.nSjcRA/_old 2014-09-01 16:58:59.000000000 +0200 +++ /var/tmp/diff_new_pack.nSjcRA/_new 2014-09-01 16:58:59.000000000 +0200 @@ -16,6 +16,13 @@ # +# Xspice is x86_64 only since spice-server is x86_64 only +%ifarch x86_64 +%if %{suse_version} >= 1230 +%bcond_without xspice +%endif +%endif + Name: xf86-video-qxl Version: 0.1.2 Release: 0 @@ -25,6 +32,7 @@ Url: http://xorg.freedesktop.org/ Source0: http://xorg.freedesktop.org/releases/individual/driver/%{name}-%{version}.tar.bz2 Patch0: n_hardcode_libdrm_cflags.patch +Patch1: n_disable-surfaces-on-kms.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool @@ -49,17 +57,43 @@ %description qxl is an Xorg driver for QXL virtual GPU as found in the spice project. +%if 0%{?with_xspice} +%package -n xorg-x11-server-Xspice +Summary: XSpice is an X server that can be accessed by a Spice client +Group: System/X11/Servers/XF86_4 +%x11_abi_videodrv_req +Requires: python >= 2.6 +BuildRequires: pkgconfig(spice-server) >= 0.6.3 + +%description -n xorg-x11-server-Xspice +XSpice is both an X and a Spice server that can be accessed by a Spice client. +%endif + %prep %setup -q %patch0 -p0 +%patch1 -p1 %build autoreconf -fi -%configure +%configure \ +%if 0%{?with_xspice} + --enable-xspice +%endif + make %{?_smp_mflags} %install %make_install +%if 0%{?with_xspice} +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11 +install -p -m 644 examples/spiceqxl.xorg.conf.example \ + $RPM_BUILD_ROOT%{_sysconfdir}/X11/spiceqxl.xorg.conf +# FIXME: upstream installs this file by default, we install it elsewhere. +# upstream should just not install it and let dist package deal with +# doc/examples. +rm -f $RPM_BUILD_ROOT/usr/share/doc/xf86-video-qxl/spiceqxl.xorg.conf.example +%endif find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print %files @@ -68,4 +102,13 @@ %dir %{_libdir}/xorg/modules/drivers %{_libdir}/xorg/modules/drivers/qxl_drv.so +%if 0%{?with_xspice} +%files -n xorg-x11-server-Xspice +%defattr(-,root,root) +%doc COPYING README.xspice README examples/spiceqxl.xorg.conf.example +%config(noreplace) %{_sysconfdir}/X11/spiceqxl.xorg.conf +%{_bindir}/Xspice +%{_libdir}/xorg/modules/drivers/spiceqxl_drv.so +%endif + %changelog ++++++ n_disable-surfaces-on-kms.patch ++++++ --- src/qxl_kms.c | 4 ++++ 1 file changed, 4 insertions(+) --- a/src/qxl_kms.c +++ b/src/qxl_kms.c @@ -593,6 +593,9 @@ qxl_kms_surface_create(qxl_screen_t *qxl int height, int bpp) { +#if 1 /* XXX surfaces support is broken on KMS */ + return NULL; +#else SpiceSurfaceFmt format; qxl_surface_t *surface; int stride; @@ -669,6 +672,7 @@ qxl_kms_surface_create(qxl_screen_t *qxl surface->bpp = bpp; return surface; +#endif /* XXX */ } static void qxl_kms_surface_destroy(qxl_surface_t *surf) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
