snapshot master to build against latest mesa
This commit is contained in:
parent
e684903b3c
commit
32153f89f5
1
.gitignore
vendored
1
.gitignore
vendored
@ -6,3 +6,4 @@ xf86-video-vmware-11.0.1.tar.bz2
|
|||||||
/xf86-video-vmware-20120718.tar.bz2
|
/xf86-video-vmware-20120718.tar.bz2
|
||||||
/xf86-video-vmware-20130109.tar.bz2
|
/xf86-video-vmware-20130109.tar.bz2
|
||||||
/xf86-video-vmware-13.0.1.tar.bz2
|
/xf86-video-vmware-13.0.1.tar.bz2
|
||||||
|
/xf86-video-vmware-20131207.tar.bz2
|
||||||
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
b08e0195ebf3f88a82129322cb93da08 xf86-video-vmware-13.0.1.tar.bz2
|
6be5cffd40a6d4bdb675749aa7aa8eaa xf86-video-vmware-20131207.tar.bz2
|
||||||
|
@ -1,14 +0,0 @@
|
|||||||
diff -up xf86-video-vmware-13.0.1/src/compat-api.h.jx xf86-video-vmware-13.0.1/src/compat-api.h
|
|
||||||
--- xf86-video-vmware-13.0.1/src/compat-api.h.jx 2012-08-06 18:31:14.000000000 -0400
|
|
||||||
+++ xf86-video-vmware-13.0.1/src/compat-api.h 2013-10-24 15:35:30.457648735 -0400
|
|
||||||
@@ -96,4 +96,10 @@
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+#include "xorg-server.h"
|
|
||||||
+#include "xorgVersion.h"
|
|
||||||
+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,14,99,3,0)
|
|
||||||
+#define DamageUnregister(a, b) DamageUnregister(b)
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
#endif
|
|
@ -1,8 +1,8 @@
|
|||||||
%define tarball xf86-video-vmware
|
%define tarball xf86-video-vmware
|
||||||
%define moduledir %(pkg-config xorg-server --variable=moduledir )
|
%define moduledir %(pkg-config xorg-server --variable=moduledir )
|
||||||
%define driverdir %{moduledir}/drivers
|
%define driverdir %{moduledir}/drivers
|
||||||
#define gitdate 20130109
|
%define gitdate 20131207
|
||||||
%define gitversion adf375f3
|
%define gitversion a40cbd7b
|
||||||
|
|
||||||
%if 0%{?gitdate}
|
%if 0%{?gitdate}
|
||||||
%define gver .%{gitdate}git%{gitversion}
|
%define gver .%{gitdate}git%{gitversion}
|
||||||
@ -11,7 +11,7 @@
|
|||||||
Summary: Xorg X11 vmware video driver
|
Summary: Xorg X11 vmware video driver
|
||||||
Name: xorg-x11-drv-vmware
|
Name: xorg-x11-drv-vmware
|
||||||
Version: 13.0.1
|
Version: 13.0.1
|
||||||
Release: 6%{?gver}%{?dist}
|
Release: 7%{?gver}%{?dist}
|
||||||
URL: http://www.x.org
|
URL: http://www.x.org
|
||||||
License: MIT
|
License: MIT
|
||||||
Group: User Interface/X Hardware Support
|
Group: User Interface/X Hardware Support
|
||||||
@ -22,8 +22,6 @@ Source0: %{tarball}-%{gitdate}.tar.bz2
|
|||||||
Source0: ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
|
Source0: ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
Patch0: vmware-13.0.1-xserver-1.15-compat.patch
|
|
||||||
|
|
||||||
ExclusiveArch: %{ix86} x86_64 ia64
|
ExclusiveArch: %{ix86} x86_64 ia64
|
||||||
|
|
||||||
%if 0%{?gitdate}
|
%if 0%{?gitdate}
|
||||||
@ -42,7 +40,6 @@ X.Org X11 vmware video driver.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
|
%setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
|
||||||
%patch0 -p1 -b .compat
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%if 0%{?gitdate}
|
%if 0%{?gitdate}
|
||||||
@ -69,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_mandir}/man4/vmware.4*
|
%{_mandir}/man4/vmware.4*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sat Dec 07 2013 Dave Airlie <airlied@redhat.com> 13.0.1-7
|
||||||
|
- snapshot master to build against latest mesa
|
||||||
|
|
||||||
* Wed Nov 20 2013 Adam Jackson <ajax@redhat.com> - 13.0.1-6
|
* Wed Nov 20 2013 Adam Jackson <ajax@redhat.com> - 13.0.1-6
|
||||||
- 1.15RC2 ABI rebuild
|
- 1.15RC2 ABI rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user