rpms/xorg-x11-drv-vmware
5
0
Fork 0
Code Issues Pull Requests Releases Activity

New upstream bug-fix release 13.2.1

Browse Source
This commit is contained in:
Hans de Goede 2017-01-09 10:42:08 +01:00
parent cb4fb62293
commit 569432cbf1
4 changed files with 9 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -10,3 +10,4 @@ xf86-video-vmware-11.0.1.tar.bz2
/xf86-video-vmware-13.0.2.tar.bz2
/xf86-video-vmware-20140613.tar.bz2
/xf86-video-vmware-20150211.tar.bz2
/xf86-video-vmware-13.2.1.tar.bz2

32
0001-Adapt-Block-WakeupHandler-signature-for-ABI-23.patch
View File

@ -1,32 +0,0 @@
From 55d8ea32a0aab73ea64b9b280fba08b2fe5bc5d9 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Thu, 29 Sep 2016 19:37:22 +0200
Subject: [PATCH xf86-video-vmware] Adapt Block/WakeupHandler signature for ABI
23
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
src/compat-api.h | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/compat-api.h b/src/compat-api.h
index 205ac59..02876c5 100644
--- a/src/compat-api.h
+++ b/src/compat-api.h
@@ -75,8 +75,13 @@
#define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv
+#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0)
+#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout
+#define BLOCKHANDLER_ARGS arg, pTimeout
+#else
#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask
#define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
+#endif
#define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
#define CLOSE_SCREEN_ARGS pScreen
--
2.9.3

2
sources
View File

@ -1 +1 @@
1b78d1c77fedb5ebea4d501de773fa2a xf86-video-vmware-20150211.tar.bz2
SHA512 (xf86-video-vmware-13.2.1.tar.bz2) = 9c48eaf5be6ece5685e07a53842083d091edba482ac0ea8318ac5b0adb9fc468f932685e4bdaf7e565f7a1cf723dcea2731616613798ebde2bbc18418a369a9d

17
xorg-x11-drv-vmware.spec
View File

@ -1,8 +1,8 @@
%global tarball xf86-video-vmware
%global moduledir %(pkg-config xorg-server --variable=moduledir )
%global driverdir %{moduledir}/drivers
%global gitdate 20150211
%global gitversion 8f0cf7c
#global gitdate 20150211
#global gitversion 8f0cf7c
%undefine _hardened_build
@ -12,8 +12,8 @@
Summary: Xorg X11 vmware video driver
Name: xorg-x11-drv-vmware
Version: 13.0.2
Release: 12%{?gver}%{?dist}
Version: 13.2.1
Release: 1%{?gver}%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X Hardware Support
@ -23,13 +23,10 @@ Source0: %{tarball}-%{gitdate}.tar.bz2
%else
Source0: ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
%endif
Patch0: 0001-Adapt-Block-WakeupHandler-signature-for-ABI-23.patch
ExclusiveArch: %{ix86} x86_64 ia64
%if 0%{?gitdate}
BuildRequires: autoconf automake libtool
%endif
BuildRequires: xorg-x11-server-devel >= 1.10.99.902
BuildRequires: libdrm-devel pkgconfig(xext) pkgconfig(x11)
BuildRequires: mesa-libxatracker-devel >= 8.0.1-4
@ -43,12 +40,9 @@ X.Org X11 vmware video driver.
%prep
%setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
%patch0 -p1
%build
%if 0%{?gitdate}
autoreconf -v --install || exit 1
%endif
%configure --disable-static
make %{?_smp_mflags}
@ -64,6 +58,9 @@ find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
%{_mandir}/man4/vmware.4*
%changelog
* Mon Jan 9 2017 Hans de Goede <hdegoede@redhat.com> - 13.2.1-1
- New upstream bug-fix release 13.2.1
* Thu Sep 29 2016 Hans de Goede <hdegoede@redhat.com> - 13.0.2-12.20150211git8f0cf7c
- Add patches from upstream for use with xserver-1.19
- Rebuild against xserver-1.19