- Up to 2.21.9.

[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 6e8ae89c94973f194bb920a1c8e7fc9e607f6790..2d4e04ccb20ed9eced5eaf7abf8a3a938c4bb1f3 100644 (file)
--- a/xorg-driver-video-intel.spec
+++ b/xorg-driver-video-intel.spec
@@ -1,27 +1,43 @@
-%define        libdrm_ver      2.4.22
+#
+# Conditional build:
+%bcond_with    glamor  Glamor acceleration
+%bcond_without sna     SandyBridge's New Acceleration (also for older generations)
+#
+%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.12.902
+Version:       2.21.9
 Release:       1
 License:       MIT
 Group:         X11/Applications
 Source0:       http://xorg.freedesktop.org/releases/individual/driver/xf86-video-intel-%{version}.tar.bz2
-# Source0-md5: 995ae6d19f466f3e69f0c59816898cf5
+# Source0-md5: fd96651b0d90dc7e977b23fd54f2c3e8
 URL:           http://xorg.freedesktop.org/
 BuildRequires: Mesa-libGL-devel
-#BuildRequires:        autoconf >= 2.57
-#BuildRequires:        automake >= 1.10.2-2
+#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
+#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-libXvMC-devel
 BuildRequires: xorg-lib-libpciaccess-devel >= 0.10
-BuildRequires: xorg-proto-dri2proto-devel
+BuildRequires: xorg-proto-dri2proto-devel >= 2.6
 BuildRequires: xorg-proto-fontsproto-devel
 BuildRequires: xorg-proto-glproto-devel
 BuildRequires: xorg-proto-randrproto-devel
@@ -30,19 +46,23 @@ BuildRequires:      xorg-proto-videoproto-devel
 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.3
-BuildRequires: xorg-xserver-server-devel >= 1.6.3
+BuildRequires: xorg-util-util-macros >= 1.8
+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
 Obsoletes:     XFree86-i810
-Obsoletes:     xorg-driver-video-i810
+Obsoletes:     xorg-driver-video-i810 < 1.7.2
+Conflicts:     vbetool
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -60,8 +80,8 @@ Requires Kernel Mode Setting (KMS) to be active.
 Sterownik obrazu X.org dla zintegrowanych układów graficznych Intela.
 Obsługuje:
 - układy i810, i810-DC100, i810e, i815, 830M, 845G, 852GM, 855GM,
-  865G, 915G, 915GM, 945G, 945GM, 965G, 965Q, 946GZ, 965GM, 945GME,
-  G33, Q33, G35, Q35, GM45, G45, Q45, G43, G41,
+  865G, 915G, 915GM, 945G, 945GM, 965G, 965Q, 946GZ, 965GM, 945GME, G33,
+  Q33, G35, Q35, GM45, G45, Q45, G43, G41,
 - Pineview-M w procesorach Atom z serii N400,
 - Pineview-D w procesorach Atom z serii D400/D500.
 
@@ -72,7 +92,11 @@ Wymaga aktywnego Kernel Mode Setting (KMS).
 
 %build
 %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}
 
 %{__make}
 
@@ -82,7 +106,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