diff --git a/.gitignore b/.gitignore index 53844c8..f77d5e9 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/xf86-video-vmware-13.0.2.tar.bz2 +SOURCES/xf86-video-vmware-20150211.tar.bz2 diff --git a/.xorg-x11-drv-vmware.metadata b/.xorg-x11-drv-vmware.metadata index 6c4a7e3..cceef93 100644 --- a/.xorg-x11-drv-vmware.metadata +++ b/.xorg-x11-drv-vmware.metadata @@ -1 +1 @@ -ec38323a260e50c00f033aeff486a3ae53f46997 SOURCES/xf86-video-vmware-13.0.2.tar.bz2 +fece37d898638758b6ea66d5ca37ae5d7c46bb7d SOURCES/xf86-video-vmware-20150211.tar.bz2 diff --git a/SOURCES/vmware-13.0.1-xv-fix.patch b/SOURCES/vmware-13.0.1-xv-fix.patch deleted file mode 100644 index acc4327..0000000 --- a/SOURCES/vmware-13.0.1-xv-fix.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up xf86-video-vmware-13.0.1/src/vmwarevideo.c.jx xf86-video-vmware-13.0.1/src/vmwarevideo.c ---- xf86-video-vmware-13.0.1/src/vmwarevideo.c.jx 2012-08-06 18:31:14.000000000 -0400 -+++ xf86-video-vmware-13.0.1/src/vmwarevideo.c 2014-08-14 09:51:15.960270366 -0400 -@@ -789,7 +789,8 @@ vmwareVideoPlay(ScrnInfoPtr pScrn, VMWAR - struct PACKED _body { - uint32 escape; - uint32 streamId; -- struct _item items[SVGA_VIDEO_NUM_REGS]; -+ /* Old hosts can not handle more then these regs */ -+ struct _item items[SVGA_VIDEO_DATA_GMRID]; - }; - - struct PACKED _cmdSetRegs { -@@ -831,7 +832,7 @@ vmwareVideoPlay(ScrnInfoPtr pScrn, VMWAR - cmdSetRegs.body.streamId = pVid->streamId; - - items = cmdSetRegs.body.items; -- for (i = SVGA_VIDEO_ENABLED; i < SVGA_VIDEO_NUM_REGS; i++) { -+ for (i = SVGA_VIDEO_ENABLED; i < SVGA_VIDEO_DATA_GMRID; i++) { - items[i].regId = i; - } - diff --git a/SPECS/xorg-x11-drv-vmware.spec b/SPECS/xorg-x11-drv-vmware.spec index 1e9bfa8..8f69ee0 100644 --- a/SPECS/xorg-x11-drv-vmware.spec +++ b/SPECS/xorg-x11-drv-vmware.spec @@ -1,8 +1,8 @@ %define tarball xf86-video-vmware %define moduledir %(pkg-config xorg-server --variable=moduledir ) %define driverdir %{moduledir}/drivers -#define gitdate 20130109 -%define gitversion adf375f3 +%define gitdate 20150211 +%define gitversion 8f0cf7c %if 0%{?gitdate} %define gver .%{gitdate}git%{gitversion} @@ -11,7 +11,7 @@ Summary: Xorg X11 vmware video driver Name: xorg-x11-drv-vmware Version: 13.0.2 -Release: 1%{?gver}%{?dist} +Release: 7%{?gver}%{?dist} URL: http://www.x.org License: MIT 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 %endif -Patch1: vmware-13.0.1-xv-fix.patch - ExclusiveArch: %{ix86} x86_64 ia64 %if 0%{?gitdate} @@ -41,7 +39,6 @@ X.Org X11 vmware video driver. %prep %setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}} -%patch1 -p1 -b .xv %build %if 0%{?gitdate} @@ -51,31 +48,53 @@ autoreconf -v --install || exit 1 make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT - -make install DESTDIR=$RPM_BUILD_ROOT +%make_install # 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 -* Tue Sep 09 2014 Adam Jackson 13.0.2-1 -- vmware 13.0.2 plus an Xv fix from RHEL 6.6 +* Wed Feb 11 2015 Hans de Goede - 13.0.2-7.20150211git8f0cf7c +- xserver 1.17 ABI rebuild +- Update to git snapshot of the day to fix building with xserver 1.17 + +* Mon Aug 18 2014 Fedora Release Engineering - 13.0.2-6.20140613git82c9b0c +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Mon Jun 16 2014 Hans de Goede - 13.0.2-5.20140613git82c9b0c +- xserver 1.15.99.903 ABI rebuild + +* Fri Jun 13 2014 Hans de Goede - 13.0.2-4.20140613git82c9b0c +- Snapshot from git master to fix render accel not working (rhbz#1077453) -* Wed Jan 15 2014 Adam Jackson - 13.0.1-7 +* Sun Jun 08 2014 Fedora Release Engineering - 13.0.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Tue May 13 2014 Hans de Goede - 13.0.2-2 +- Add server managed fd support + +* Mon Apr 28 2014 Hans de Goede - 13.0.2-1 +- vmware 13.0.2 + +* Mon Apr 28 2014 Hans de Goede - 13.0.1-10.20131207gita40cbd7b +- xserver 1.15.99-20140428 git snapshot ABI rebuild + +* Mon Jan 13 2014 Adam Jackson - 13.0.1-9.20131207gita40cbd7b - 1.15 ABI rebuild -* Fri Dec 27 2013 Daniel Mach - 13.0.1-6 -- Mass rebuild 2013-12-27 +* Tue Dec 17 2013 Adam Jackson - 13.0.1-8.20131207gita40cbd7b +- 1.15RC4 ABI rebuild + +* Sat Dec 07 2013 Dave Airlie 13.0.1-7 +- snapshot master to build against latest mesa + +* Wed Nov 20 2013 Adam Jackson - 13.0.1-6 +- 1.15RC2 ABI rebuild * Wed Nov 06 2013 Adam Jackson - 13.0.1-5 - 1.15RC1 ABI rebuild