Build with DRI3 support by default, Release: 5

[packages/xorg-driver-video-intel.git] / xorg-driver-video-intel.spec

diff --git a/xorg-driver-video-intel.spec b/xorg-driver-video-intel.spec
index 2bd7b44e8dc59e44030004c25d367f3556e5c517..4454b842ef8ad2506e9fab476f9d86c32391de3c 100644 (file)
--- a/xorg-driver-video-intel.spec
+++ b/xorg-driver-video-intel.spec
@@ -1,28 +1,48 @@
-%define        libdrm_ver      2.4.25
+#
+# Conditional build:
+%bcond_with    glamor  Glamor acceleration
+%bcond_without sna     SandyBridge's New Acceleration (also for older generations)
+%bcond_without dri3    DRI3 support
+#
+%define        libdrm_ver      2.4.41
+%define        pixman_ver      0.28.0
+%if %{with sna}
+%define        xserver_ver     1.10
+%else
+%define        xserver_ver     1.6.3
+%endif
 Summary:       X.org video driver for Intel integrated graphics chipsets
 Summary(pl.UTF-8):     Sterownik obrazu X.org dla zintegrowanych układów graficznych Intela
 Name:          xorg-driver-video-intel
-Version:       2.15.901
-Release:       1
+Version:       2.99.917
+Release:       5
 License:       MIT
 Group:         X11/Applications
 Source0:       http://xorg.freedesktop.org/releases/individual/driver/xf86-video-intel-%{version}.tar.bz2
-# Source0-md5: 0c53119892de3aab0dff967fb7c2e09d
+# Source0-md5: fa196a66e52c0c624fe5d350af7a5e7b
 URL:           http://xorg.freedesktop.org/
+Patch0:                %{name}-xserver_1_8_0.patch
+Patch1:                git.patch
 BuildRequires: Mesa-libGL-devel
 #BuildRequires:        autoconf >= 2.63
 #BuildRequires:        automake >= 1:1.10.2-2
+%{?with_glamor:BuildRequires:  glamor-devel >= 0.3.1}
 BuildRequires: libdrm-devel >= %{libdrm_ver}
 #BuildRequires:        libtool >= 2:2.2
 BuildRequires: libxcb-devel >= 1.5
+BuildRequires: pixman-devel >= %{pixman_ver}
 BuildRequires: pkgconfig >= 1:0.19
 BuildRequires: rpmbuild(macros) >= 1.389
 BuildRequires: udev-devel
 BuildRequires: xcb-util-devel
+BuildRequires: xorg-lib-libX11-devel
 BuildRequires: xorg-lib-libXfixes-devel
+BuildRequires: xorg-lib-libXrender-devel
+BuildRequires: xorg-lib-libXtst-devel
 BuildRequires: xorg-lib-libXvMC-devel
 BuildRequires: xorg-lib-libpciaccess-devel >= 0.10
-BuildRequires: xorg-proto-dri2proto-devel
+BuildRequires: xorg-proto-dri2proto-devel >= 2.6
+%{?with_dri3:BuildRequires:    xorg-proto-dri3proto-devel}
 BuildRequires: xorg-proto-fontsproto-devel
 BuildRequires: xorg-proto-glproto-devel
 BuildRequires: xorg-proto-randrproto-devel
@@ -32,13 +52,16 @@ BuildRequires:      xorg-proto-xextproto-devel >= 7.0.99.1
 BuildRequires: xorg-proto-xf86driproto-devel
 BuildRequires: xorg-proto-xproto-devel >= 7.0.13
 BuildRequires: xorg-util-util-macros >= 1.8
-BuildRequires: xorg-xserver-server-devel >= 1.6.3
+BuildRequires: xorg-xserver-server-devel >= %{xserver_ver}
 %{?requires_xorg_xserver_videodrv}
+%{?with_glamor:Requires:       glamor >= 0.3.1}
 Requires:      libdrm >= %{libdrm_ver}
+Requires:      pixman >= %{pixman_ver}
 Requires:      xorg-lib-libpciaccess >= 0.10
-Requires:      xorg-xserver-libdri >= 1.6.3
-Requires:      xorg-xserver-libglx >= 1.6.3
-Requires:      xorg-xserver-server >= 1.6.3
+Requires:      xorg-xserver-libdri >= %{xserver_ver}
+Requires:      xorg-xserver-libglx >= %{xserver_ver}
+Requires:      xorg-xserver-server >= %{xserver_ver}
+Provides:      xorg-driver-video
 Provides:      xorg-driver-video-i810
 Obsoletes:     X11-driver-i810 < 1:7.0.0
 Obsoletes:     XFree86-driver-i810 < 1:7.0.0
@@ -71,10 +94,21 @@ Wymaga aktywnego Kernel Mode Setting (KMS).
 
 %prep
 %setup -q -n xf86-video-intel-%{version}
+%patch0 -p1
+%patch1 -p1
 
 %build
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure \
-       --disable-silent-rules
+       --disable-silent-rules \
+       %{?with_glamor:--enable-glamor} \
+       --with-default-accel=%{?with_sna:sna}%{!?with_sna:uxa} \
+       --enable-uxa \
+       --enable-sna%{!?with_sna:=no} \
+       %{__enable_disable dri3}
 
 %{__make}
 
@@ -84,7 +118,7 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-rm $RPM_BUILD_ROOT%{_libdir}/xorg/modules/*/*.la \
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/*/*.la \
        $RPM_BUILD_ROOT%{_libdir}/lib*XvMC.{la,so}
 
 %clean
@@ -96,9 +130,13 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS COPYING ChangeLog NEWS README
+%attr(755,root,root) %{_bindir}/intel-virtual-output
+%attr(755,root,root) %{_libdir}/xf86-video-intel-backlight-helper
 %attr(755,root,root) %{_libdir}/libI810XvMC.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libI810XvMC.so.1
 %attr(755,root,root) %{_libdir}/libIntelXvMC.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libIntelXvMC.so.1
 %attr(755,root,root) %{_libdir}/xorg/modules/drivers/intel_drv.so
 %{_mandir}/man4/intel.4*
+%{_mandir}/man4/intel-virtual-output.4*
+%{_datadir}/polkit-1/actions/org.x.xf86-video-intel.backlight-helper.policy