- BR pixman 0.24.0

[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 1c07f9de76eb02d829ea34c2627f2bad87d28c45..b14f2ec8150a979663d69bc9d70e41163e11c0f3 100644 (file)
--- a/xorg-driver-video-intel.spec
+++ b/xorg-driver-video-intel.spec
@@ -1,65 +1,82 @@
+%define        libdrm_ver      2.4.25
 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.3.0
-Release:       1
+Version:       2.16.0
+Release:       3
 License:       MIT
 Group:         X11/Applications
-Source0:       http://xorg.freedesktop.org/releases/individual/driver/xf86-video-intel-%{version}.tar.bz2 
-# Source0-md5: 7973532f6c1d46e2631932cd1d20bd69
+Source0:       http://xorg.freedesktop.org/releases/individual/driver/xf86-video-intel-%{version}.tar.bz2
+# Source0-md5: e0406c50a747c358654b93cb23bf7375
 URL:           http://xorg.freedesktop.org/
 BuildRequires: Mesa-libGL-devel
-BuildRequires: autoconf >= 2.57
-BuildRequires: automake
-BuildRequires: libdrm-devel >= 2.3
-# for DRI_MM
-#BuildRequires:        libdrm-devel >= 2.3.1
-BuildRequires: libtool
+#BuildRequires:        autoconf >= 2.63
+#BuildRequires:        automake >= 1:1.10.2-2
+BuildRequires: libdrm-devel >= %{libdrm_ver}
+#BuildRequires:        libtool >= 2:2.2
+BuildRequires: libxcb-devel >= 1.5
+BuildRequires: pixman-devel >= 0.24.0
 BuildRequires: pkgconfig >= 1:0.19
-BuildRequires: xorg-lib-libpciaccess-devel >= 0.10
+BuildRequires: rpmbuild(macros) >= 1.389
+BuildRequires: udev-devel
+BuildRequires: xcb-util-devel
+BuildRequires: xorg-lib-libXfixes-devel
 BuildRequires: xorg-lib-libXvMC-devel
+BuildRequires: xorg-lib-libpciaccess-devel >= 0.10
+BuildRequires: xorg-proto-dri2proto-devel >= 2.6
 BuildRequires: xorg-proto-fontsproto-devel
+BuildRequires: xorg-proto-glproto-devel
 BuildRequires: xorg-proto-randrproto-devel
 BuildRequires: xorg-proto-renderproto-devel
-BuildRequires: xorg-proto-glproto-devel
 BuildRequires: xorg-proto-videoproto-devel
+BuildRequires: xorg-proto-xextproto-devel >= 7.0.99.1
 BuildRequires: xorg-proto-xf86driproto-devel
-BuildRequires: xorg-proto-xineramaproto-devel
-BuildRequires: xorg-util-util-macros >= 1.1.3
-BuildRequires: xorg-xserver-server-devel >= 1.3.0.0
-BuildRequires:  rpmbuild(macros) >= 1.389
-%requires_xorg_xserver_videodrv
-Requires:      xorg-xserver-server >= 1.3.0.0
+BuildRequires: xorg-proto-xproto-devel >= 7.0.13
+BuildRequires: xorg-util-util-macros >= 1.8
+BuildRequires: xorg-xserver-server-devel >= 1.6.3
+%{?requires_xorg_xserver_videodrv}
+Requires:      libdrm >= %{libdrm_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
+Provides:      xorg-driver-video
 Provides:      xorg-driver-video-i810
 Obsoletes:     X11-driver-i810 < 1:7.0.0
-Obsoletes:     XFree86-i810
 Obsoletes:     XFree86-driver-i810 < 1:7.0.0
-Obsoletes:     xorg-driver-video-i810
+Obsoletes:     XFree86-i810
+Obsoletes:     xorg-driver-video-i810 < 1.7.2
+Conflicts:     vbetool
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-X.org video driver for Intel integrated graphics chipsets. It supports
-the i810, i810-DC100, i810e, i815, 830M, 845G, 852GM, 855GM, 865G,
-915G, 915GM, 945G, 945GM, 965G, 965Q, 946GZ, 965GM, 945GME, G33, Q33
-and Q35 chipsets.
+X.org video driver for Intel integrated graphics chipsets. It
+supports:
+- 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 chipsets,
+- Pineview-M in Atom N400 series,
+- Pineview-D in Atom D400/D500 series.
+
+Requires Kernel Mode Setting (KMS) to be active.
 
 %description -l pl.UTF-8
 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 i Q35.
+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,
+- Pineview-M w procesorach Atom z serii N400,
+- Pineview-D w procesorach Atom z serii D400/D500.
+
+Wymaga aktywnego Kernel Mode Setting (KMS).
 
 %prep
 %setup -q -n xf86-video-intel-%{version}
 
 %build
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
 %configure \
-       --disable-static
+       --disable-silent-rules
 
 %{__make}
 
@@ -69,7 +86,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
@@ -80,17 +97,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc COPYING README
-%attr(755,root,root) %{_libdir}/xorg/modules/drivers/intel_drv.so
-%attr(755,root,root) %{_libdir}/xorg/modules/drivers/i810_drv.so
-%attr(755,root,root) %{_libdir}/xorg/modules/drivers/ch7017.so
-%attr(755,root,root) %{_libdir}/xorg/modules/drivers/ch7xxx.so
-%attr(755,root,root) %{_libdir}/xorg/modules/drivers/ivch.so
-%attr(755,root,root) %{_libdir}/xorg/modules/drivers/sil164.so
-%attr(755,root,root) %{_libdir}/xorg/modules/drivers/tfp410.so
+%doc AUTHORS COPYING ChangeLog NEWS README
 %attr(755,root,root) %{_libdir}/libI810XvMC.so.*.*.*
-%ghost %attr(755,root,root) %{_libdir}/libI810XvMC.so.1
+%attr(755,root,root) %ghost %{_libdir}/libI810XvMC.so.1
 %attr(755,root,root) %{_libdir}/libIntelXvMC.so.*.*.*
-%ghost %attr(755,root,root) %{_libdir}/libIntelXvMC.so.1
+%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/i810.4*