diff --git a/SOURCES/xf86-video-openchrome-0.3.3-build-fix.patch b/SOURCES/xf86-video-openchrome-0.3.3-build-fix.patch new file mode 100644 index 0000000..9be6e14 --- /dev/null +++ b/SOURCES/xf86-video-openchrome-0.3.3-build-fix.patch @@ -0,0 +1,11 @@ +diff -up xf86-video-openchrome-0.3.3/src/via_3d.h~ xf86-video-openchrome-0.3.3/src/via_3d.h +--- xf86-video-openchrome-0.3.3/src/via_3d.h~ 2013-05-23 17:11:28.000000000 +0200 ++++ xf86-video-openchrome-0.3.3/src/via_3d.h 2015-02-11 17:29:30.135382604 +0100 +@@ -24,6 +24,7 @@ + #ifndef VIA_3D_H + #define VIA_3D_H + ++#include "xorg-server.h" + #include "xf86.h" + #include "via_dmabuffer.h" + diff --git a/SPECS/xorg-x11-drv-openchrome.spec b/SPECS/xorg-x11-drv-openchrome.spec index bb573c2..6aee337 100644 --- a/SPECS/xorg-x11-drv-openchrome.spec +++ b/SPECS/xorg-x11-drv-openchrome.spec @@ -1,7 +1,7 @@ %define tarball xf86-video-openchrome %define moduledir %(pkg-config xorg-server --variable=moduledir ) %define driverdir %{moduledir}/drivers -%define gitdate +#define gitdate %define gitversion 131175a71 %if 0%{?gitdate} @@ -14,8 +14,8 @@ Summary: Xorg X11 openchrome video driver Name: xorg-x11-drv-openchrome Version: 0.3.3 -Release: 6%{?gver}%{?dist} -URL: http://www.openchrome.org +Release: 14%{?gver}%{?dist} +URL: http://www.freedesktop.org/wiki/Openchrome/ License: MIT Group: User Interface/X Hardware Support @@ -28,6 +28,7 @@ Source0: http://xorg.freedesktop.org/archive/individual/driver/%{tarball} # Upstream patches : # Fedora specific patches : +Patch0: xf86-video-openchrome-0.3.3-build-fix.patch # Experimental patches (branch backport, etc...): Patch13: openchrome-0.2.904-fix_tvout_flickering.patch @@ -71,6 +72,7 @@ X.Org X11 openchrome video driver XvMC development package. %prep %setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{?!gitdate:%{version}} +%patch0 -p1 %build @@ -100,10 +102,17 @@ rm -rf $RPM_BUILD_ROOT %post +%if %{with_xvmc} +/sbin/ldconfig +%endif if [ -e /etc/X11/xorg.conf ]; then sed -i "/Driver/s/via/openchrome/" /etc/X11/xorg.conf || : fi +%if %{with_xvmc} +%postun -p /sbin/ldconfig +%endif + %files %defattr(-,root,root,-) @@ -127,11 +136,36 @@ fi %changelog -* Wed Jan 15 2014 Adam Jackson - 0.3.3-6 +* Wed Feb 11 2015 Hans de Goede - 0.3.3-14 +- xserver 1.17 ABI rebuild + +* Mon Aug 18 2014 Fedora Release Engineering - 0.3.3-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Mon Jun 16 2014 Hans de Goede - 0.3.3-12 +- xserver 1.15.99.903 ABI rebuild + +* Sun Jun 08 2014 Fedora Release Engineering - 0.3.3-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Mon Apr 28 2014 Hans de Goede - 0.3.3-10 +- xserver 1.15.99-20140428 git snapshot ABI rebuild + +* Sat Mar 22 2014 Xavier Bachelot - 0.3.3-9 +- Change URL: to fd.o. + +* Mon Jan 13 2014 Adam Jackson - 0.3.3-8 - 1.15 ABI rebuild -* Fri Dec 27 2013 Daniel Mach - 0.3.3-5 -- Mass rebuild 2013-12-27 +* Sat Dec 21 2013 Ville Skyttä - 0.3.3-7 +- Call ldconfig in %%post* scriptlets. +- Fix bogus dates in %%changelog. + +* Tue Dec 17 2013 Adam Jackson - 0.3.3-6 +- 1.15RC4 ABI rebuild + +* Wed Nov 20 2013 Adam Jackson - 0.3.3-5 +- 1.15RC2 ABI rebuild * Wed Nov 06 2013 Adam Jackson - 0.3.3-4 - 1.15RC1 ABI rebuild @@ -175,7 +209,7 @@ fi * Fri Jul 20 2012 Dave Airlie 0.2.906-2 - temporary git snapshot, to fix deps after X server rebuild -* Wed May 15 2012 Xavier Bachelot - 0.2.906-1 +* Wed May 16 2012 Xavier Bachelot - 0.2.906-1 - Update to 0.2.906. * Thu May 03 2012 Xavier Bachelot - 0.2.905-6 @@ -184,7 +218,7 @@ fi * Mon Mar 26 2012 Xavier Bachelot - 0.2.905-5 - Make EXA work out of the box. -* Fri Mar 15 2012 Xavier Bachelot - 0.2.905-4 +* Thu Mar 15 2012 Xavier Bachelot - 0.2.905-4 - Make EXA the default (but disable compositing) (RHBZ#804194). - Xv support for VX900. @@ -216,10 +250,10 @@ fi * Thu Aug 18 2011 Adam Jackson - 0.2.904-15 - Rebuild for xserver 1.11 ABI -* Sat May 06 2011 Xavier Bachelot - 0.2.904-14 +* Sat May 07 2011 Xavier Bachelot - 0.2.904-14 - Bump release. -* Sat May 06 2011 Xavier Bachelot - 0.2.904-13 +* Sat May 07 2011 Xavier Bachelot - 0.2.904-13 - Update to svn921 for XO 1.5 regression and Xv crash fix (RHBZ #697901). - Update I420 patch (RHBZ #674551). @@ -286,7 +320,7 @@ fi * Mon Jul 27 2009 Fedora Release Engineering - 0.2.903-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild -* Mon Jul 18 2009 Xavier Bachelot - 0.2.903-12 +* Sat Jul 18 2009 Xavier Bachelot - 0.2.903-12 - Update to latest snapshot (svn 758) : - Basic VX855 support. - Fix pci space corruption on P4M900 (RHBZ#506622). @@ -362,7 +396,7 @@ fi * Sat May 31 2008 Xavier Bachelot - 0.2.902-7 - New panel and hardware cursor code from randr branch. -* Sun May 31 2008 Xavier Bachelot - 0.2.902-6 +* Sat May 31 2008 Xavier Bachelot - 0.2.902-6 - Disable XvDMA for K8M890 and P4M890 (RHBZ #391621). * Mon May 26 2008 Xavier Bachelot - 0.2.902-5 @@ -418,7 +452,7 @@ fi * Wed Jan 23 2008 Xavier Bachelot - 0.2.901-6 - Add patch to properly set fifo on P4M900. -* Fri Jan 19 2008 Xavier Bachelot - 0.2.901-5 +* Sat Jan 19 2008 Xavier Bachelot - 0.2.901-5 - Add patch to replace xf86memcpy by plain memcpy. * Thu Jan 10 2008 Xavier Bachelot - 0.2.901-4 @@ -435,7 +469,7 @@ fi - Remove obsoleted patches. - Update libpciaccess patch. -* Fri Dec 08 2007 Xavier Bachelot - 0.2.900-9 +* Sat Dec 08 2007 Xavier Bachelot - 0.2.900-9 - Add patch for preliminary libpciaccess support. * Wed Nov 28 2007 Adam Jackson 0.2.900-8