diff --git a/.xorg-x11-drv-vmware.metadata b/.xorg-x11-drv-vmware.metadata new file mode 100644 index 0000000..6c0c216 --- /dev/null +++ b/.xorg-x11-drv-vmware.metadata @@ -0,0 +1 @@ +c7109eb9f683156b12d3c55a74d51345ab70abfe SOURCES/xf86-video-vmware-13.0.1.tar.bz2 diff --git a/README.md b/README.md deleted file mode 100644 index 0e7897f..0000000 --- a/README.md +++ /dev/null @@ -1,5 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 - -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/vmware-13.0.1-xserver-1.15-compat.patch b/SOURCES/vmware-13.0.1-xserver-1.15-compat.patch new file mode 100644 index 0000000..d7c5483 --- /dev/null +++ b/SOURCES/vmware-13.0.1-xserver-1.15-compat.patch @@ -0,0 +1,14 @@ +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 diff --git a/SPECS/xorg-x11-drv-vmware.spec b/SPECS/xorg-x11-drv-vmware.spec new file mode 100644 index 0000000..6f7f01d --- /dev/null +++ b/SPECS/xorg-x11-drv-vmware.spec @@ -0,0 +1,254 @@ +%define tarball xf86-video-vmware +%define moduledir %(pkg-config xorg-server --variable=moduledir ) +%define driverdir %{moduledir}/drivers +#define gitdate 20130109 +%define gitversion adf375f3 + +%if 0%{?gitdate} +%define gver .%{gitdate}git%{gitversion} +%endif + +Summary: Xorg X11 vmware video driver +Name: xorg-x11-drv-vmware +Version: 13.0.1 +Release: 5%{?gver}%{?dist} +URL: http://www.x.org +License: MIT +Group: User Interface/X Hardware Support + +%if 0%{?gitdate} +Source0: %{tarball}-%{gitdate}.tar.bz2 +%else +Source0: ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2 +%endif + +Patch0: vmware-13.0.1-xserver-1.15-compat.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 + +Requires: Xorg %(xserver-sdk-abi-requires ansic) +Requires: Xorg %(xserver-sdk-abi-requires videodrv) +Requires: libxatracker >= 8.0.1-4 + +%description +X.Org X11 vmware video driver. + +%prep +%setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}} +%patch0 -p1 -b .compat + +%build +%if 0%{?gitdate} +autoreconf -v --install || exit 1 +%endif +%configure --disable-static +make %{?_smp_mflags} + +%install +rm -rf $RPM_BUILD_ROOT + +make install DESTDIR=$RPM_BUILD_ROOT + +# FIXME: Remove all libtool archives (*.la) from modules directory. This +# should be fixed in upstream Makefile.am or whatever. +find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f -- + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root,-) +%{driverdir}/vmware_drv.so +%{_mandir}/man4/vmware.4* + +%changelog +* Wed Nov 06 2013 Adam Jackson - 13.0.1-5 +- 1.15RC1 ABI rebuild + +* Fri Oct 25 2013 Adam Jackson - 13.0.1-4 +- ABI rebuild + +* Thu Oct 24 2013 Adam Jackson 13.0.1-3 +- xserver 1.15 API compat + +* Sun Aug 04 2013 Fedora Release Engineering - 13.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Tue Apr 23 2013 Peter Hutterer 13.0.1-1 +- vmware 13.0.1 + +* Thu Mar 07 2013 Peter Hutterer - 12.0.99.901-5.20130109gitadf375f3 +- require xorg-x11-server-devel, not -sdk + +* Thu Mar 07 2013 Peter Hutterer - 12.0.99.901-4.20130109gitadf375f3 +- ABI rebuild + +* Fri Feb 15 2013 Peter Hutterer - 12.0.99.901-3.20130109gitadf375f3 +- ABI rebuild + +* Fri Feb 15 2013 Peter Hutterer - 12.0.99.901-2.20130109gitadf375f3 +- ABI rebuild + +* Wed Jan 09 2013 Adam Jackson 12.0.99.901-1 +- vmware 12.0.99.901 + +* Sun Jul 22 2012 Fedora Release Engineering - 12.0.2-3.20120718gite5ac80d8f +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Wed Jul 18 2012 Dave Airlie 12.0.2-1.20120718gite5ac80d8f +- snapshot latest git for api changes + +* Fri Apr 20 2012 Adam Jackson 12.0.2-1 +- vmware 12.0.2 + +* Mon Mar 19 2012 Adam Jackson 12.0.1-2 +- vmware-12.0.1-vgahw.patch: Fix a different crash at start (#782995) +- vmware-12.0.1-git.patch: Backport a garbage-free fix from git. + +* Thu Mar 15 2012 Dave Airlie 12.0.1-1 +- update to latest upstream release + +* Mon Mar 12 2012 Adam Jackson 11.0.3-14 +- vmware-11.0.3-vgahw.patch: Fix crash at start. (#801546) + +* Sat Feb 11 2012 Peter Hutterer - 11.0.3-13 +- ABI rebuild + +* Fri Feb 10 2012 Peter Hutterer - 11.0.3-12 +- ABI rebuild + +* Tue Jan 24 2012 Peter Hutterer - 11.0.3-11 +- ABI rebuild + +* Wed Jan 04 2012 Peter Hutterer - 11.0.3-10 +- Rebuild for server 1.12 + +* Fri Dec 16 2011 Adam Jackson - 11.0.3-9 +- Drop xinf file + +* Wed Nov 16 2011 Adam Jackson 11.0.3-8 +- ABI rebuild +- vmware-11.0.3-abi12.patch: Compensate for videoabi 12. +- vmware-11.0.3-unbreak-xinerama.patch: Unbreak swapped dispatch in the + fake-xinerama code. + +* Wed Nov 09 2011 ajax - 11.0.3-7 +- ABI rebuild + +* Thu Aug 18 2011 Adam Jackson - 11.0.3-6 +- Rebuild for xserver 1.11 ABI + +* Wed May 11 2011 Peter Hutterer - 11.0.3-5 +- Rebuild for server 1.11 + +* Mon Feb 28 2011 Peter Hutterer - 11.0.3-4 +- Rebuild for server 1.10 + +* Tue Feb 08 2011 Fedora Release Engineering - 11.0.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Thu Dec 02 2010 Peter Hutterer - 11.0.3-2 +- Rebuild for server 1.10 + +* Tue Nov 09 2010 Adam Jackson 11.0.3-1 +- vmware 11.0.3 + +* Wed Oct 27 2010 Adam Jackson 11.0.1-2 +- Add ABI requires magic (#542742) + +* Tue Aug 10 2010 Dave Airlie 11.0.1-1 +- Latest upstream release. + +* Mon Jul 05 2010 Peter Hutterer - 10.16.7-4 +- rebuild for X Server 1.9 + +* Thu Jan 21 2010 Peter Hutterer - 10.16.7-3 +- Rebuild for server 1.8 + +* Fri Aug 07 2009 Adam Jackson 10.16.7-2 +- fix for symbol list removal. + +* Tue Aug 04 2009 Dave Airlie 10.16.7-1 +- vmware 10.16.7 + new abi patch + +* Mon Jul 27 2009 Fedora Release Engineering - 10.16.0-5.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Jul 15 2009 Adam Jackson - 10.16.0-4.1 +- ABI bump + +* Tue Jun 23 2009 Dave Airlie 10.16.0-4 +- abi.patch: patch for new server ABI + +* Thu Feb 26 2009 Fedora Release Engineering - 10.16.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Wed Dec 24 2008 Dave Airlie 10.16.0-2 +- bump build for new server API + +* Thu Mar 20 2008 Dave Airlie 10.16.0-1 +- Latest upstream release + +* Wed Feb 20 2008 Fedora Release Engineering - 10.15.2-100.1 +- Autorebuild for GCC 4.3 + +* Tue Jan 22 2008 Adam Jackson 10.15.2-99.1 +- Update to git snapshot for pciaccess conversion. (#428613) + +* Thu Oct 11 2007 Adam Jackson 10.15.2-1 +- xf86-video-vmware 10.15.2 + +* Mon Sep 24 2007 Adam Jackson 10.15.1-1 +- xf86-video-vmware 10.15.1 + +* Fri Aug 24 2007 Adam Jackson - 10.14.1-3 +- Rebuild for build ID + +* Mon Jun 18 2007 Adam Jackson 10.14.1-2 +- Update Requires and BuildRequires. Disown the module directories. Add + Requires: hwdata. + +* Fri Jan 05 2007 Adam Jackson 10.14.1-1.fc7 +- Update to 10.14.1 + +* Wed Jul 12 2006 Jesse Keating - sh: line 0: fg: no job control +- rebuild + +* Tue May 23 2006 Adam Jackson 10.13.0-2 +- Rebuild for 7.1 ABI fix. + +* Sun Apr 9 2006 Adam Jackson 10.13.0-1 +- Update to 10.13.0 from 7.1RC1. + +* Tue Feb 07 2006 Jesse Keating - 10.11.1.3-1.1 +- rebuilt for new gcc4.1 snapshot and glibc changes + +* Wed Jan 18 2006 Mike A. Harris 10.11.1.3-1 +- Updated xorg-x11-drv-vmware to version 10.11.1.3 from X11R7.0 + +* Tue Dec 20 2005 Mike A. Harris 10.11.1.2-1 +- Updated xorg-x11-drv-vmware to version 10.11.1.2 from X11R7 RC4 +- Removed 'x' suffix from manpage dirs to match RC4 upstream. + +* Wed Nov 16 2005 Mike A. Harris 10.11.1-1 +- Updated xorg-x11-drv-vmware to version 10.11.1 from X11R7 RC2 + +* Fri Nov 4 2005 Mike A. Harris 10.11.0.1-1 +- Updated xorg-x11-drv-vmware to version 10.11.0.1 from X11R7 RC1 +- Fix *.la file removal. + +* Tue Oct 4 2005 Mike A. Harris 10.10.2-1 +- Update BuildRoot to use Fedora Packaging Guidelines. +- Deglob file manifest. +- Limit "ExclusiveArch" to x86, x86_64, ia64 + +* Fri Sep 2 2005 Mike A. Harris 10.10.2-0 +- Initial spec file for vmware video driver generated automatically + by my xorg-driverspecgen script.